3 files changed, 12 insertions, 20 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index 218c5a355ddb..b4edadf96ecf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -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);
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.h b/drivers/net/wireless/iwlwifi/iwl-4965.h
index dda2bfbcb059..c0e9747ca49c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.h
@@ -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 */
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 8bc2634bb407..4561933acb1d 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -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;