forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mac80211: re-upload keys only after telling driver about association

Browse source 
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>
This commit is contained in:
Johannes Berg 2009-04-08 02:55:34 +02:00 • committed by John W. Linville
commit 4499b23933
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
net/mac80211/pm.c
View file

@ -127,11 +127,6 @@ int __ieee80211_resume(struct ieee80211_hw *hw)
rcu_read_unlock(); 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 */ /* setup RTS threshold */
if (local->ops->set_rts_threshold) if (local->ops->set_rts_threshold)
local->ops->set_rts_threshold(hw, local->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_wake_queues_by_reason(hw,
IEEE80211_QUEUE_STOP_REASON_SUSPEND); IEEE80211_QUEUE_STOP_REASON_SUSPEND);