* [PATCH] mac80211: skip disabled channels in VHT check
@ 2015-01-01 11:43 Arik Nemtsov
2015-01-06 10:57 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Arik Nemtsov @ 2015-01-01 11:43 UTC (permalink / raw)
To: linux-wireless; +Cc: Johannes Berg, Arik Nemtsov
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>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mac80211: skip disabled channels in VHT check
2015-01-01 11:43 [PATCH] mac80211: skip disabled channels in VHT check Arik Nemtsov
@ 2015-01-06 10:57 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2015-01-06 10:57 UTC (permalink / raw)
To: Arik Nemtsov; +Cc: linux-wireless
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-06 10:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-01 11:43 [PATCH] mac80211: skip disabled channels in VHT check Arik Nemtsov
2015-01-06 10:57 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).