summaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorBob Copeland <me@bobcopeland.com>2009-07-29 10:13:03 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-08-04 16:43:23 -0400
commit97af743207466ff8b477e14bfb7af0ba2c93375b (patch)
tree9fc275981b34346284c1aedd370c54854f5369ae /net/mac80211/main.c
parentad2f34b41fd6e2b84c896ccf321d5de0a7c7cd52 (diff)
downloadlinux-97af743207466ff8b477e14bfb7af0ba2c93375b.tar.bz2
mac80211: disable beacons before removing the associated interface
When downing interfaces, it's a good idea to tell the driver to stop sending beacons; that way the driver doesn't need special code in ops->remove_interface() when it should already handle the case in bss_info_changed(). This fixes a potential crash with at least ath5k since the vif pointer will be nullified while beacon interrupts are still active. Signed-off-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 9dd8d25611e0..5e76dd1daf71 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -198,7 +198,8 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
}
if (changed & BSS_CHANGED_BEACON_ENABLED) {
- if (test_bit(SCAN_SW_SCANNING, &local->scanning)) {
+ if (local->quiescing || !netif_running(sdata->dev) ||
+ test_bit(SCAN_SW_SCANNING, &local->scanning)) {
sdata->vif.bss_conf.enable_beacon = false;
} else {
/*