Merge remote-tracking branch 'mac80211/master' into mac80211-next

2013-05-25 00:01:30 +02:00
parent b422c6cd7e 4c8a9d4bfa
commit dde7dc759b
25 changed files with 256 additions and 179 deletions
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1714,6 +1714,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);