diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-05-24 18:01:30 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-24 18:01:30 -0400 |
commit | dde7dc759b777f385fc5df2af691c82eb455c7f3 (patch) | |
tree | 5e8f1fcd10a6b264d60bc8a0503656c0611de222 /net/mac80211/util.c | |
parent | b422c6cd7e93bb613030f14d7d8a0cc73f115629 (diff) | |
parent | 4c8a9d4bfaf7dbc7d2168494904d79d22cc01db7 (diff) |
Merge remote-tracking branch 'mac80211/master' into mac80211-next
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r-- | net/mac80211/util.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 707953fd8324..ffdfe4bc89ad 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
@@ -1714,6 +1714,13 @@ int ieee80211_reconfig(struct ieee80211_local *local) | |||
1714 | mb(); | 1714 | mb(); |
1715 | local->resuming = false; | 1715 | local->resuming = false; |
1716 | 1716 | ||
1717 | list_for_each_entry(sdata, &local->interfaces, list) { | ||
1718 | if (!ieee80211_sdata_running(sdata)) | ||
1719 | continue; | ||
1720 | if (sdata->vif.type == NL80211_IFTYPE_STATION) | ||
1721 | ieee80211_sta_restart(sdata); | ||
1722 | } | ||
1723 | |||
1717 | mod_timer(&local->sta_cleanup, jiffies + 1); | 1724 | mod_timer(&local->sta_cleanup, jiffies + 1); |
1718 | #else | 1725 | #else |
1719 | WARN_ON(1); | 1726 | WARN_ON(1); |