diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-07-31 20:52:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-20 08:43:03 -0700 |
| commit | 775f521cd8ebf7edf47e88e6d1424513dc5e70e9 (patch) | |
| tree | c9067f06224eeb7fd90ea6a9928d374315252cae /net/mac80211 | |
| parent | 42c8df37807471eac800b06891329e70b789cb44 (diff) | |
| download | linux-3.10-775f521cd8ebf7edf47e88e6d1424513dc5e70e9.tar.gz linux-3.10-775f521cd8ebf7edf47e88e6d1424513dc5e70e9.tar.bz2 linux-3.10-775f521cd8ebf7edf47e88e6d1424513dc5e70e9.zip | |
mac80211: continue using disabled channels while connected
commit ddfe49b42d8ad4bfdf92d63d4a74f162660d878d upstream.
In case the AP has different regulatory information than we do,
it can happen that we connect to an AP based on e.g. the world
roaming regulatory data, and then update our database with the
AP's country information disables the channel the AP is using.
If this happens on an HT AP, the bandwidth tracking code will
hit the WARN_ON() and disconnect. Since that's not very useful,
ignore the channel-disable flag in bandwidth tracking.
Reported-by: Chris Wright <chrisw@sous-sol.org>
Tested-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 1f57de7b7c0..55a42f9c4f3 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -361,8 +361,17 @@ out: if (ret & IEEE80211_STA_DISABLE_VHT) vht_chandef = *chandef; + /* + * Ignore the DISABLED flag when we're already connected and only + * tracking the APs beacon for bandwidth changes - otherwise we + * might get disconnected here if we connect to an AP, update our + * regulatory information based on the AP's country IE and the + * information we have is wrong/outdated and disables the channel + * that we're actually using for the connection to the AP. + */ while (!cfg80211_chandef_usable(sdata->local->hw.wiphy, chandef, - IEEE80211_CHAN_DISABLED)) { + tracking ? 0 : + IEEE80211_CHAN_DISABLED)) { if (WARN_ON(chandef->width == NL80211_CHAN_WIDTH_20_NOHT)) { ret = IEEE80211_STA_DISABLE_HT | IEEE80211_STA_DISABLE_VHT; |