2015-01-01 11:43:20

by Arik Nemtsov

Subject: [PATCH] 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 <[email protected]>
---
net/mac80211/util.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 0f9bf47..ad8cb4f 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) {
--
2.1.0

2015-01-06 10:57:07

by Johannes Berg

Subject: Re: [PATCH] mac80211: skip disabled channels in VHT check

On Thu, 2015-01-01 at 13:43 +0200, Arik Nemtsov wrote:
> 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.

Applied.

johannes