diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-06-12 08:50:15 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-06-12 08:50:15 -0400 |
| commit | 4431f95bfe5fe0d7909599c0e50d649f2ef6b9e1 (patch) | |
| tree | d1bebccd5dd85a30b90e298c70d77f31341a12f9 /net/mac80211 | |
| parent | 9ff5baa988e758044a62a05b1f668b5ff556517c (diff) | |
| parent | 7313dd1519ea5cd81f67bc26b180e472d102ff88 (diff) | |
Merge tag 'v3.2.20' into v3.2-rt
This is the 3.2.20 stable release
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/util.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index d5230ecc784d..7095ae599d95 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1111,6 +1111,12 @@ int ieee80211_reconfig(struct ieee80211_local *local) } } + /* add back keys */ + list_for_each_entry(sdata, &local->interfaces, list) + if (ieee80211_sdata_running(sdata)) + ieee80211_enable_keys(sdata); + + wake_up: /* * Clear the WLAN_STA_BLOCK_BA flag so new aggregation * sessions can be established after a resume. @@ -1132,12 +1138,6 @@ int ieee80211_reconfig(struct ieee80211_local *local) mutex_unlock(&local->sta_mtx); } - /* add back keys */ - list_for_each_entry(sdata, &local->interfaces, list) - if (ieee80211_sdata_running(sdata)) - ieee80211_enable_keys(sdata); - - wake_up: ieee80211_wake_queues_by_reason(hw, IEEE80211_QUEUE_STOP_REASON_SUSPEND); |