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

Commit 3240cab3 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlagn: clean up some 3945/4965 remnants 



When the driver was split, a bunch of definitions
for the 3945 and 4965 devices stayed around, but
they're now useless so remove (some of) them.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 68e022df

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

+0 −28
Original line number Diff line number Diff line
@@ -41,20 +41,6 @@ struct iwl_rate_info { 
	u8 next_rs_tgg;  /* next rate used in TGG rs algo */

};



struct iwl3945_rate_info {

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

	u8 ieee;		/* MAC header:  IWL_RATE_6M_IEEE, etc. */

	u8 prev_ieee;		/* previous rate in IEEE speeds */

	u8 next_ieee;		/* next rate in IEEE speeds */

	u8 prev_rs;		/* previous rate used in rs algo */

	u8 next_rs;		/* next rate used in rs algo */

	u8 prev_rs_tgg;		/* previous rate used in TGG rs algo */

	u8 next_rs_tgg;		/* next rate used in TGG rs algo */

	u8 table_rs_index;	/* index in rate scale table cmd */

	u8 prev_table_rs;	/* prev in rate table cmd */

};





/*

 * These serve as indexes into

 * struct iwl_rate_info iwl_rates[IWL_RATE_COUNT];
@@ -75,7 +61,6 @@ enum { 
	IWL_RATE_60M_INDEX,

	IWL_RATE_COUNT, /*FIXME:RS:change to IWL_RATE_INDEX_COUNT,*/

	IWL_RATE_COUNT_LEGACY = IWL_RATE_COUNT - 1,	/* Excluding 60M */

	IWL_RATE_COUNT_3945 = IWL_RATE_COUNT - 1,

	IWL_RATE_INVM_INDEX = IWL_RATE_COUNT,

	IWL_RATE_INVALID = IWL_RATE_COUNT,

};
@@ -213,7 +198,6 @@ enum { 
	 IWL_CCK_BASIC_RATES_MASK)



#define IWL_RATES_MASK ((1 << IWL_RATE_COUNT) - 1)

#define IWL_RATES_MASK_3945 ((1 << IWL_RATE_COUNT_3945) - 1)



#define IWL_INVALID_VALUE    -1
@@ -453,19 +437,9 @@ static inline u8 first_antenna(u8 mask) 
}





/**

 * iwl3945_rate_scale_init - Initialize the rate scale table based on assoc info

 *

 * The specific throughput table used is based on the type of network

 * the associated with, including A, B, G, and G w/ TGG protection

 */

extern void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id);



/* Initialize station's rate scaling information after adding station */

extern void iwl_rs_rate_init(struct iwl_priv *priv,

			     struct ieee80211_sta *sta, u8 sta_id);

extern void iwl3945_rs_rate_init(struct iwl_priv *priv,

				 struct ieee80211_sta *sta, u8 sta_id);



/**

 * iwl_rate_control_register - Register the rate control algorithm callbacks
@@ -478,7 +452,6 @@ extern void iwl3945_rs_rate_init(struct iwl_priv *priv, 
 *

 */

extern int iwlagn_rate_control_register(void);

extern int iwl3945_rate_control_register(void);



/**

 * iwl_rate_control_unregister - Unregister the rate control callbacks
@@ -487,6 +460,5 @@ extern int iwl3945_rate_control_register(void); 
 * the driver is unloaded.

 */

extern void iwlagn_rate_control_unregister(void);

extern void iwl3945_rate_control_unregister(void);



#endif /* __iwl_agn__rs__ */

drivers/net/wireless/iwlwifi/iwl-agn-sta.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv, 
	memset(&priv->stations[sta_id].keyinfo, 0,

					sizeof(struct iwl_hw_key));

	memset(&priv->stations[sta_id].sta.key, 0,

					sizeof(struct iwl4965_keyinfo));

					sizeof(struct iwl_keyinfo));

	priv->stations[sta_id].sta.key.key_flags =

			STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID;

	priv->stations[sta_id].sta.key.key_offset = WEP_INVALID_OFFSET;

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

+0 −2
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ 
#include "iwl-dev.h"



/* configuration for the _agn devices */

extern struct iwl_cfg iwl4965_agn_cfg;

extern struct iwl_cfg iwl5300_agn_cfg;

extern struct iwl_cfg iwl5100_agn_cfg;

extern struct iwl_cfg iwl5350_agn_cfg;
@@ -114,7 +113,6 @@ extern struct iwl_hcmd_ops iwlagn_bt_hcmd; 
extern struct iwl_hcmd_utils_ops iwlagn_hcmd_utils;



extern struct ieee80211_ops iwlagn_hw_ops;

extern struct ieee80211_ops iwl4965_hw_ops;



int iwl_reset_ict(struct iwl_priv *priv);

void iwl_disable_ict(struct iwl_priv *priv);

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

+1 −590

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/iwlwifi/iwl-core.c

+0 −1
Original line number Diff line number Diff line
@@ -1430,7 +1430,6 @@ void iwl_mac_remove_interface(struct ieee80211_hw *hw, 


	iwl_teardown_interface(priv, vif, false);



	memset(priv->bssid, 0, ETH_ALEN);

	mutex_unlock(&priv->mutex);



	IWL_DEBUG_MAC80211(priv, "leave\n");