summaryrefslogtreecommitdiffstats
path: root/net/mac80211/util.c
diff options
context:
space:
mode:
authorJohannes Berg2013-04-29 14:57:44 +0200
committerJohannes Berg2013-05-16 22:38:04 +0200
commitb8360ab8d2caf8a4d0d95bc03f0ba6956459505f (patch)
treee4baf6380fd79fff844e2485e10f83d9b1aff864 /net/mac80211/util.c
parentcfg80211: fix WoWLAN wakeup tracing (diff)
downloadkernel-qcow2-linux-b8360ab8d2caf8a4d0d95bc03f0ba6956459505f.tar.gz
kernel-qcow2-linux-b8360ab8d2caf8a4d0d95bc03f0ba6956459505f.tar.xz
kernel-qcow2-linux-b8360ab8d2caf8a4d0d95bc03f0ba6956459505f.zip
mac80211: fix IEEE80211_SDATA_DISCONNECT_RESUME
Since commit 12e7f517029dad819c45eca9ca01fdb9ba57616b, IEEE80211_SDATA_DISCONNECT_RESUME no longer worked as it would simply never be tested. Restore a bit of the code removed there and in 9b7d72c1041ec5b20b24af487a9 to make it work again. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r--net/mac80211/util.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 3f87fa468b1f..27e07150eb46 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1740,6 +1740,13 @@ int ieee80211_reconfig(struct ieee80211_local *local)
mb();
local->resuming = false;
+ list_for_each_entry(sdata, &local->interfaces, list) {
+ if (!ieee80211_sdata_running(sdata))
+ continue;
+ if (sdata->vif.type == NL80211_IFTYPE_STATION)
+ ieee80211_sta_restart(sdata);
+ }
+
mod_timer(&local->sta_cleanup, jiffies + 1);
#else
WARN_ON(1);