diff options
| author | Arik Nemtsov <arik@wizery.com> | 2015-01-01 13:43:17 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-06 14:59:07 +0100 |
| commit | fa44b988d2da58334ecbcf3e00f9acccbdeace6c (patch) | |
| tree | 758d5be6e81e45f87a94bb0fdfa3bff8c32ff309 /net | |
| parent | 71b836eca7f380fbd4c025f8c4371f9a071bc909 (diff) | |
| download | linux-fa44b988d2da58334ecbcf3e00f9acccbdeace6c.tar.gz linux-fa44b988d2da58334ecbcf3e00f9acccbdeace6c.tar.xz | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/util.c | 10 |
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) { |