Skip to content

Commit

Permalink
mac80211: skip disabled channels in VHT check
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arik Nemtsov authored and Johannes Berg committed Jan 6, 2015
1 parent 71b836e commit fa44b98
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions net/mac80211/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit fa44b98

Please sign in to comment.