diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/mwl8k.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 77f4b43b9b74..a9a4fcef7e42 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -2225,9 +2225,9 @@ static void iwl_ht_conf(struct iwl_priv *priv, | |||
2225 | 2225 | ||
2226 | iwl_conf->tx_chan_width = iwl_conf->supported_chan_width != 0; | 2226 | iwl_conf->tx_chan_width = iwl_conf->supported_chan_width != 0; |
2227 | iwl_conf->ht_protection = | 2227 | iwl_conf->ht_protection = |
2228 | bss_conf->ht.operation_mode & IEEE80211_HT_OP_MODE_PROTECTION; | 2228 | bss_conf->ht_operation_mode & IEEE80211_HT_OP_MODE_PROTECTION; |
2229 | iwl_conf->non_GF_STA_present = | 2229 | iwl_conf->non_GF_STA_present = |
2230 | !!(bss_conf->ht.operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT); | 2230 | !!(bss_conf->ht_operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT); |
2231 | 2231 | ||
2232 | rcu_read_unlock(); | 2232 | rcu_read_unlock(); |
2233 | 2233 | ||
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index b1213b6a6b9f..61a4ad7cc1c2 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c | |||
@@ -642,7 +642,7 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw, | |||
642 | if (changed & BSS_CHANGED_HT) { | 642 | if (changed & BSS_CHANGED_HT) { |
643 | printk(KERN_DEBUG " %s: HT: op_mode=0x%x\n", | 643 | printk(KERN_DEBUG " %s: HT: op_mode=0x%x\n", |
644 | wiphy_name(hw->wiphy), | 644 | wiphy_name(hw->wiphy), |
645 | info->ht.operation_mode); | 645 | info->ht_operation_mode); |
646 | } | 646 | } |
647 | 647 | ||
648 | if (changed & BSS_CHANGED_BASIC_RATES) { | 648 | if (changed & BSS_CHANGED_BASIC_RATES) { |
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 46b288dc8f4d..a263d5c84c08 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -2369,7 +2369,7 @@ static int mwl8k_cmd_set_aid(struct ieee80211_hw *hw, | |||
2369 | if (info->use_cts_prot) { | 2369 | if (info->use_cts_prot) { |
2370 | prot_mode = MWL8K_FRAME_PROT_11G; | 2370 | prot_mode = MWL8K_FRAME_PROT_11G; |
2371 | } else { | 2371 | } else { |
2372 | switch (info->ht.operation_mode & | 2372 | switch (info->ht_operation_mode & |
2373 | IEEE80211_HT_OP_MODE_PROTECTION) { | 2373 | IEEE80211_HT_OP_MODE_PROTECTION) { |
2374 | case IEEE80211_HT_OP_MODE_PROTECTION_20MHZ: | 2374 | case IEEE80211_HT_OP_MODE_PROTECTION_20MHZ: |
2375 | prot_mode = MWL8K_FRAME_PROT_11N_HT_40MHZ_ONLY; | 2375 | prot_mode = MWL8K_FRAME_PROT_11N_HT_40MHZ_ONLY; |