Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4499b239 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e45d8e53

net/mac80211/pm.c

+5 −5
Original line number Diff line number Diff line
@@ -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);