1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 2cac09405afe..e6695e80fb53 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -552,7 +552,7 @@ static int iwl4965_send_beacon_cmd(struct iwl_priv *priv)
 static void iwl4965_ht_conf(struct iwl_priv *priv,
                             struct ieee80211_bss_conf *bss_conf)
 {
-        struct ieee80211_ht_info *ht_conf = bss_conf->ht_conf;
+        struct ieee80211_sta_ht_cap *ht_conf = bss_conf->ht_cap;
         struct ieee80211_ht_bss_info *ht_bss_conf = bss_conf->ht_bss_conf;
         struct iwl_ht_info *iwl_conf = &priv->current_ht_config;
 
@@ -573,27 +573,27 @@ static void iwl4965_ht_conf(struct iwl_priv *priv,
                 !!(ht_conf->cap & IEEE80211_HT_CAP_MAX_AMSDU);
 
         iwl_conf->supported_chan_width =
-                !!(ht_conf->cap & IEEE80211_HT_CAP_SUP_WIDTH);
+                !!(ht_conf->cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40);
         iwl_conf->extension_chan_offset =
-                ht_bss_conf->bss_cap & IEEE80211_HT_IE_CHA_SEC_OFFSET;
+                ht_bss_conf->bss_cap & IEEE80211_HT_PARAM_CHA_SEC_OFFSET;
         /* If no above or below channel supplied disable FAT channel */
-        if (iwl_conf->extension_chan_offset != IEEE80211_HT_IE_CHA_SEC_ABOVE &&
-            iwl_conf->extension_chan_offset != IEEE80211_HT_IE_CHA_SEC_BELOW) {
-                iwl_conf->extension_chan_offset = IEEE80211_HT_IE_CHA_SEC_NONE;
+        if (iwl_conf->extension_chan_offset != IEEE80211_HT_PARAM_CHA_SEC_ABOVE &&
+            iwl_conf->extension_chan_offset != IEEE80211_HT_PARAM_CHA_SEC_BELOW) {
+                iwl_conf->extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_NONE;
                 iwl_conf->supported_chan_width = 0;
         }
 
         iwl_conf->sm_ps = (u8)((ht_conf->cap & IEEE80211_HT_CAP_SM_PS) >> 2);
 
-        memcpy(iwl_conf->supp_mcs_set, ht_conf->supp_mcs_set, 16);
+        memcpy(&iwl_conf->mcs, &ht_conf->mcs, 16);
 
         iwl_conf->control_channel = ht_bss_conf->primary_channel;
         iwl_conf->tx_chan_width =
-                !!(ht_bss_conf->bss_cap & IEEE80211_HT_IE_CHA_WIDTH);
+                !!(ht_bss_conf->bss_cap & IEEE80211_HT_PARAM_CHAN_WIDTH_ANY);
         iwl_conf->ht_protection =
-                ht_bss_conf->bss_op_mode & IEEE80211_HT_IE_HT_PROTECTION;
+                ht_bss_conf->bss_op_mode & IEEE80211_HT_OP_MODE_PROTECTION;
         iwl_conf->non_GF_STA_present =
-                !!(ht_bss_conf->bss_op_mode & IEEE80211_HT_IE_NON_GF_STA_PRSNT);
+                !!(ht_bss_conf->bss_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
 
         IWL_DEBUG_MAC80211("control channel %d\n", iwl_conf->control_channel);
         IWL_DEBUG_MAC80211("leave\n");