Commit d44040de authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville

ath: fix logic on ath_reg_apply_active_scan_flags()

The existing logic removes the passive scan flag from
channels 12 and 13 when a regulatory hint coming from
something other than a country IE has been passed. This
is incorrect, the original intention was to ensure we
always have passive scan enabled for these two channels
for a specific set of custom world regulatory domains.

Cc: smihir@qti.qualcomm.com
Cc: tushnimb@qca.qualcomm.com
Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cddc6046
...@@ -249,16 +249,16 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy, ...@@ -249,16 +249,16 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy,
return; return;
/* /*
* If no country IE has been received always enable active scan * If no country IE has been received always enable passive scan
* on these channels. This is only done for specific regulatory SKUs * and no-ibss on these channels. This is only done for specific
* regulatory SKUs.
*/ */
if (initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) { if (initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
ch = &sband->channels[11]; /* CH 12 */ ch = &sband->channels[11]; /* CH 12 */
if (ch->flags & IEEE80211_CHAN_NO_IR) ch->flags |= IEEE80211_CHAN_NO_IR;
ch->flags &= ~IEEE80211_CHAN_NO_IR;
ch = &sband->channels[12]; /* CH 13 */ ch = &sband->channels[12]; /* CH 13 */
if (ch->flags & IEEE80211_CHAN_NO_IR) ch->flags |= IEEE80211_CHAN_NO_IR;
ch->flags &= ~IEEE80211_CHAN_NO_IR;
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment