aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-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 027302326498..2b4c95cd9daf 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -127,11 +127,6 @@ int __ieee80211_resume(struct ieee80211_hw *hw)
127 127
128 rcu_read_unlock(); 128 rcu_read_unlock();
129 129
130 /* add back keys */
131 list_for_each_entry(sdata, &local->interfaces, list)
132 if (netif_running(sdata->dev))
133 ieee80211_enable_keys(sdata);
134
135 /* setup RTS threshold */ 130 /* setup RTS threshold */
136 if (local->ops->set_rts_threshold) 131 if (local->ops->set_rts_threshold)
137 local->ops->set_rts_threshold(hw, local->rts_threshold); 132 local->ops->set_rts_threshold(hw, local->rts_threshold);
@@ -172,6 +167,11 @@ int __ieee80211_resume(struct ieee80211_hw *hw)
172 } 167 }
173 } 168 }
174 169
170 /* add back keys */
171 list_for_each_entry(sdata, &local->interfaces, list)
172 if (netif_running(sdata->dev))
173 ieee80211_enable_keys(sdata);
174
175 ieee80211_wake_queues_by_reason(hw, 175 ieee80211_wake_queues_by_reason(hw,
176 IEEE80211_QUEUE_STOP_REASON_SUSPEND); 176 IEEE80211_QUEUE_STOP_REASON_SUSPEND);
177 177