summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-07 20:41:50 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-02-15 09:41:33 +0100
commitcb145022c82bde532b386c7a6f1dcef1b2bca2e5 (patch)
tree2a2f944cd5c2c4aa22e83a8e510b16565851949d /net/mac80211
parent1128958dc22cbfa2562082da2621a06ba71bdce2 (diff)
downloadlinux-cb145022c82bde532b386c7a6f1dcef1b2bca2e5.tar.bz2
mac80211: fix HT/VHT disable flags
The code to disable HT and VHT if VHT was advertised without VHT is wrong -- it accidentally uses the wrong flags. Fix that. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mlme.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index b97b615d5711..e6da6bf8cc27 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3588,8 +3588,8 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
vht_oper = NULL;
sdata_info(sdata,
"AP advertised VHT without HT, disabling both\n");
- sdata->flags |= IEEE80211_STA_DISABLE_HT;
- sdata->flags |= IEEE80211_STA_DISABLE_VHT;
+ ifmgd->flags |= IEEE80211_STA_DISABLE_HT;
+ ifmgd->flags |= IEEE80211_STA_DISABLE_VHT;
}
}