Commit 9e0cc6de authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by David S. Miller
Browse files

iwlwifi: 802.11n new framework structures preperation 



This patch removes unnecessary or duplicate 802.11n data from structures
in the code, and prepares them for new mac80211's 802.11n framework

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 923effd8

drivers/net/wireless/iwlwifi/iwl-4965-rs.c

+1 −1
Original line number Diff line number Diff line
@@ -2123,7 +2123,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta, 
	if (local->hw.conf.phymode == MODE_IEEE80211A)

		sta->last_txrate += IWL_FIRST_OFDM_RATE;



	crl->is_dup = priv->is_dup;

	crl->is_dup = 0;

	crl->valid_antenna = priv->valid_antenna;

	crl->antenna = priv->antenna;

	crl->is_green = rs_use_green(priv);

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

+11 −17
Original line number Diff line number Diff line
@@ -510,22 +510,23 @@ union iwl4965_ht_rate_supp { 
#define CFG_HT_MPDU_DENSITY_2USEC   (0x5)

#define CFG_HT_MPDU_DENSITY_DEF CFG_HT_MPDU_DENSITY_2USEC



struct sta_ht_info {

struct iwl_ht_info {

	/* self configuration data */

	u8 is_ht;

	u16 rx_mimo_ps_mode;

	u8 supported_chan_width;

	u16 tx_mimo_ps_mode;

	u16 control_channel;

	u8 is_green_field;

	u8 sgf;

	u8 max_amsdu_size;

	u8 ampdu_factor;

	u8 mpdu_density;

	u8 operating_mode;

	u8 supported_chan_width;

	u8 supp_mcs_set[16];

	/* BSS related data */

	u8 control_channel;

	u8 extension_chan_offset;

	u8 is_green_field;

	u8 sgf;			/* HT_SHORT_GI_* short guard interval */

	u8 supp_rates[16];

	u8 tx_chan_width;

	u8 chan_width_cap;

	u8 ht_protection;

	u8 non_GF_STA_present;

};

#endif				/*CONFIG_IWL4965_HT */
@@ -1142,12 +1143,6 @@ struct iwl4965_priv { 
	u8 call_post_assoc_from_beacon;

	u8 assoc_station_added;

	u8 use_ant_b_for_management_frame;	/* Tx antenna selection */



	/* High Throughput (HT) variables */

	u8 is_dup;

	u8 is_ht_enabled;

	u8 channel_width;	/* 0=20MHZ, 1=40MHZ supported */

	u8 current_channel_width;

	u8 valid_antenna;	/* Bit mask of antennas actually connected */

#ifdef CONFIG_IWL4965_SENSITIVITY

	struct iwl4965_sensitivity_data sensitivity_data;
@@ -1157,9 +1152,8 @@ struct iwl4965_priv { 
#endif /*CONFIG_IWL4965_SENSITIVITY*/



#ifdef CONFIG_IWL4965_HT

	struct sta_ht_info current_assoc_ht;

	struct iwl_ht_info current_ht_config;

#endif

	u8 active_rate_ht[2];

	u8 last_phy_res[100];



	/* Rate scaling data */

drivers/net/wireless/iwlwifi/iwl4965-base.c

+0 −2
Original line number Diff line number Diff line
@@ -9296,8 +9296,6 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e 


	priv->ps_mode = 0;

	priv->use_ant_b_for_management_frame = 1; /* start with ant B */

	priv->is_ht_enabled = 1;

	priv->channel_width = IWL_CHANNEL_WIDTH_40MHZ;

	priv->valid_antenna = 0x7;	/* assume all 3 connected */

	priv->ps_mode = IWL_MIMO_PS_NONE;