mac80211: skip disabled channels in VHT check

The patch "40a11ca mac80211: check if channels allow 80 MHz for VHT
probe requests" considered disabled channels as VHT enabled, and
mistakenly sent out probe-requests with the VHT IE.

Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 0f9bf479952e..ad8cb4fb441e 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1470,10 +1470,12 @@ static int ieee80211_build_preq_ies_band(struct ieee80211_local *local,
 
         /* Check if any channel in this sband supports at least 80 MHz */
         for (i = 0; i < sband->n_channels; i++) {
-                if (!(sband->channels[i].flags & IEEE80211_CHAN_NO_80MHZ)) {
-                        have_80mhz = true;
-                        break;
-                }
+                if (sband->channels[i].flags & (IEEE80211_CHAN_DISABLED |
+                                                IEEE80211_CHAN_NO_80MHZ))
+                        continue;
+
+                have_80mhz = true;
+                break;
         }
 
         if (sband->vht_cap.vht_supported && have_80mhz) {