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>

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 152577cc22130d622188c65e5d6b8e0847f9fc83..16b678bea10647bd45cf206d4f61c7ed0f515caf 100644 (file)
--- 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)