Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61e98de8 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: move antenna definitions to config 



Since they're used in the config, they
should be declared in iwl-config.h.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 586aed96

drivers/net/wireless/iwlwifi/iwl-agn-rs.h

+1 −9
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <net/mac80211.h>

#include <net/mac80211.h>





#include "iwl-commands.h"

#include "iwl-commands.h"

#include "iwl-config.h"





struct iwl_rate_info {

struct iwl_rate_info {

	u8 plcp;	/* uCode API:  IWL_RATE_6M_PLCP, etc. */

	u8 plcp;	/* uCode API:  IWL_RATE_6M_PLCP, etc. */
@@ -280,15 +281,6 @@ enum iwl_table_type { 
#define is_a_band(tbl) ((tbl) == LQ_A)

#define is_a_band(tbl) ((tbl) == LQ_A)

#define is_g_and(tbl) ((tbl) == LQ_G)

#define is_g_and(tbl) ((tbl) == LQ_G)





#define	ANT_NONE	0x0

#define	ANT_A		BIT(0)

#define	ANT_B		BIT(1)

#define	ANT_AB		(ANT_A | ANT_B)

#define ANT_C		BIT(2)

#define	ANT_AC		(ANT_A | ANT_C)

#define ANT_BC		(ANT_B | ANT_C)

#define ANT_ABC		(ANT_AB | ANT_C)



#define IWL_MAX_MCS_DISPLAY_SIZE	12

#define IWL_MAX_MCS_DISPLAY_SIZE	12





struct iwl_rate_mcs_info {

struct iwl_rate_mcs_info {

drivers/net/wireless/iwlwifi/iwl-config.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -118,6 +118,16 @@ enum iwl_led_mode { 
#define IWL_LONG_WD_TIMEOUT	10000

#define IWL_LONG_WD_TIMEOUT	10000

#define IWL_MAX_WD_TIMEOUT	120000

#define IWL_MAX_WD_TIMEOUT	120000





/* Antenna presence definitions */

#define	ANT_NONE	0x0

#define	ANT_A		BIT(0)

#define	ANT_B		BIT(1)

#define ANT_C		BIT(2)

#define	ANT_AB		(ANT_A | ANT_B)

#define	ANT_AC		(ANT_A | ANT_C)

#define ANT_BC		(ANT_B | ANT_C)

#define ANT_ABC		(ANT_A | ANT_B | ANT_C)







/*

/*

 * @max_ll_items: max number of OTP blocks

 * @max_ll_items: max number of OTP blocks