aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Copeland <me@bobcopeland.com>2009-07-29 04:13:03 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-04 16:43:23 -0400
commit97af743207466ff8b477e14bfb7af0ba2c93375b (patch)
tree9fc275981b34346284c1aedd370c54854f5369ae
parentad2f34b41fd6e2b84c896ccf321d5de0a7c7cd52 (diff)
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>
-rw-r--r--net/mac80211/iface.c10
-rw-r--r--net/mac80211/main.c3
-rw-r--r--net/mac80211/pm.c4
3 files changed, 16 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 6c655b6547fb..6614d4ff273d 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -522,6 +522,16 @@ static int ieee80211_stop(struct net_device *dev)
522 ieee80211_scan_completed(&local->hw, true); 522 ieee80211_scan_completed(&local->hw, true);
523 } 523 }
524 524
525 /*
526 * Disable beaconing for AP and mesh, IBSS can't
527 * still be joined to a network at this point.
528 */
529 if (sdata->vif.type == NL80211_IFTYPE_AP ||
530 sdata->vif.type == NL80211_IFTYPE_MESH_POINT) {
531 ieee80211_bss_info_change_notify(sdata,
532 BSS_CHANGED_BEACON_ENABLED);
533 }
534
525 conf.vif = &sdata->vif; 535 conf.vif = &sdata->vif;
526 conf.type = sdata->vif.type; 536 conf.type = sdata->vif.type;
527 conf.mac_addr = dev->dev_addr; 537 conf.mac_addr = dev->dev_addr;
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,
198 } 198 }
199 199
200 if (changed & BSS_CHANGED_BEACON_ENABLED) { 200 if (changed & BSS_CHANGED_BEACON_ENABLED) {
201 if (test_bit(SCAN_SW_SCANNING, &local->scanning)) { 201 if (local->quiescing || !netif_running(sdata->dev) ||
202 test_bit(SCAN_SW_SCANNING, &local->scanning)) {
202 sdata->vif.bss_conf.enable_beacon = false; 203 sdata->vif.bss_conf.enable_beacon = false;
203 } else { 204 } else {
204 /* 205 /*
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index 5e3d476972f9..3320f7daaf25 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -96,6 +96,10 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
96 if (!netif_running(sdata->dev)) 96 if (!netif_running(sdata->dev))
97 continue; 97 continue;
98 98
99 /* disable beaconing */
100 ieee80211_bss_info_change_notify(sdata,
101 BSS_CHANGED_BEACON_ENABLED);
102
99 conf.vif = &sdata->vif; 103 conf.vif = &sdata->vif;
100 conf.type = sdata->vif.type; 104 conf.type = sdata->vif.type;
101 conf.mac_addr = sdata->dev->dev_addr; 105 conf.mac_addr = sdata->dev->dev_addr;