summaryrefslogtreecommitdiff
path: root/net/mac80211/pm.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-04-08 02:55:34 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-04-22 16:54:41 -0400
commit4499b23933b44bf9e56d1a29b51d9a62941f9fa4 (patch)
tree464d5b3b334341c60644a759a352065a3baf6aaa /net/mac80211/pm.c
parente45d8e534b67580eedd9b4910ccc16d6dd3cceff (diff)
downloadlinux-3.10-4499b23933b44bf9e56d1a29b51d9a62941f9fa4.tar.gz
linux-3.10-4499b23933b44bf9e56d1a29b51d9a62941f9fa4.tar.bz2
linux-3.10-4499b23933b44bf9e56d1a29b51d9a62941f9fa4.zip
mac80211: re-upload keys only after telling driver about association
In the normal WPA or RSN case keys are only configured after associating, so we should do that in that order when resuming as well. It shouldn't really matter since we do not send any data at either point, but iwlwifi prefers it this way and it does seem more natural. 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.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index 02730232649..2b4c95cd9da 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -127,11 +127,6 @@ int __ieee80211_resume(struct ieee80211_hw *hw)
rcu_read_unlock();
- /* add back keys */
- list_for_each_entry(sdata, &local->interfaces, list)
- if (netif_running(sdata->dev))
- ieee80211_enable_keys(sdata);
-
/* setup RTS threshold */
if (local->ops->set_rts_threshold)
local->ops->set_rts_threshold(hw, local->rts_threshold);
@@ -172,6 +167,11 @@ int __ieee80211_resume(struct ieee80211_hw *hw)
}
}
+ /* add back keys */
+ list_for_each_entry(sdata, &local->interfaces, list)
+ if (netif_running(sdata->dev))
+ ieee80211_enable_keys(sdata);
+
ieee80211_wake_queues_by_reason(hw,
IEEE80211_QUEUE_STOP_REASON_SUSPEND);