diff options
author | Bob Copeland <me@bobcopeland.com> | 2009-07-29 10:13:03 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-04 16:43:23 -0400 |
commit | 97af743207466ff8b477e14bfb7af0ba2c93375b (patch) | |
tree | 9fc275981b34346284c1aedd370c54854f5369ae /net/mac80211/pm.c | |
parent | ad2f34b41fd6e2b84c896ccf321d5de0a7c7cd52 (diff) | |
download | linux-stable-97af743207466ff8b477e14bfb7af0ba2c93375b.tar.gz linux-stable-97af743207466ff8b477e14bfb7af0ba2c93375b.tar.bz2 linux-stable-97af743207466ff8b477e14bfb7af0ba2c93375b.zip |
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/pm.c')
-rw-r--r-- | net/mac80211/pm.c | 4 |
1 files changed, 4 insertions, 0 deletions
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) if (!netif_running(sdata->dev)) continue; + /* disable beaconing */ + ieee80211_bss_info_change_notify(sdata, + BSS_CHANGED_BEACON_ENABLED); + conf.vif = &sdata->vif; conf.type = sdata->vif.type; conf.mac_addr = sdata->dev->dev_addr; |