summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-04-16 14:32:26 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-07 19:51:56 -0700
commit131e3afd38ede147ad56179d352a9d7b8b3d966f (patch)
tree1fdfdbb33c82cb133424b0e8aefc75f6cf0eac4b /net
parent2111a77044c72a3eeda88415e39d094752bbf25a (diff)
downloadlinux-3.10-131e3afd38ede147ad56179d352a9d7b8b3d966f.tar.gz
linux-3.10-131e3afd38ede147ad56179d352a9d7b8b3d966f.tar.bz2
linux-3.10-131e3afd38ede147ad56179d352a9d7b8b3d966f.zip
wireless: regulatory: fix channel disabling race condition
commit 990de49f74e772b6db5208457b7aa712a5f4db86 upstream. When a full scan 2.4 and 5 GHz scan is scheduled, but then the 2.4 GHz part of the scan disables a 5.2 GHz channel due to, e.g. receiving country or frequency information, that 5.2 GHz channel might already be in the list of channels to scan next. Then, when the driver checks if it should do a passive scan, that will return false and attempt an active scan. This is not only wrong but can also lead to the iwlwifi device firmware crashing since it checks regulatory as well. Fix this by not setting the channel flags to just disabled but rather OR'ing in the disabled flag. That way, even if the race happens, the channel will be scanned passively which is still (mostly) correct. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/reg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 4dc83474db2..796a0eeb26a 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -862,7 +862,7 @@ static void handle_channel(struct wiphy *wiphy,
return;
REG_DBG_PRINT("Disabling freq %d MHz\n", chan->center_freq);
- chan->flags = IEEE80211_CHAN_DISABLED;
+ chan->flags |= IEEE80211_CHAN_DISABLED;
return;
}