summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorDaniel Gabay <daniel.gabay@intel.com>2020-01-31 13:12:52 +0200
committerJohannes Berg <johannes.berg@intel.com>2020-02-07 12:41:58 +0100
commit8cadb207145c7e2fa45bbec2319cb84aec5da988 (patch)
tree30a02aa6a380ae84b9239a8eac5672f1ecbe5739 /net/mac80211
parent4a65cc2437ce4a643c24b357d849e3ff773efed1 (diff)
downloadlinux-8cadb207145c7e2fa45bbec2319cb84aec5da988.tar.gz
linux-8cadb207145c7e2fa45bbec2319cb84aec5da988.tar.bz2
linux-8cadb207145c7e2fa45bbec2319cb84aec5da988.zip
mac80211: update condition for HE disablement
Disable HE if the beacon does not contain an HE operation IE. Signed-off-by: Daniel Gabay <daniel.gabay@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Link: https://lore.kernel.org/r/20200131111300.891737-16-luca@coelho.fi 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 152577cc2213..16b678bea106 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -313,8 +313,8 @@ out:
ret |= ieee80211_chandef_downgrade(chandef);
}
- if (!cfg80211_chandef_usable(sdata->wdev.wiphy, chandef,
- IEEE80211_CHAN_NO_HE))
+ if (!he_oper || !cfg80211_chandef_usable(sdata->wdev.wiphy, chandef,
+ IEEE80211_CHAN_NO_HE))
ret |= IEEE80211_STA_DISABLE_HE;
if (chandef->width != vht_chandef.width && !tracking)