iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: let key iteration get keys in install order

Browse Source 
ieee80211_iter_keys() currently returns keys in
the backward order they were installed in, which
is a bit confusing. Add them to the tail of the
key list to make sure iterations go in the same
order that keys were originally installed in.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2011-07-13 19:50:53 +02:00 committed by John W. Linville
parent 8bca5d8153
commit f850e00fcd
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/mac80211.h
View File

@ -2987,6 +2987,10 @@ void ieee80211_sta_block_awake(struct ieee80211_hw *hw,
* needs reprogramming of the keys during suspend. Note that due * needs reprogramming of the keys during suspend. Note that due
* to locking reasons, it is also only safe to call this at few * to locking reasons, it is also only safe to call this at few
* spots since it must hold the RTNL and be able to sleep. * spots since it must hold the RTNL and be able to sleep.
*
* The order in which the keys are iterated matches the order
* in which they were originally installed and handed to the
* set_key callback.
*/ */
void ieee80211_iter_keys(struct ieee80211_hw *hw, void ieee80211_iter_keys(struct ieee80211_hw *hw,
struct ieee80211_vif *vif, struct ieee80211_vif *vif,

2
net/mac80211/key.c
View File

@ -278,7 +278,7 @@ static void __ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
bool defunikey, defmultikey, defmgmtkey; bool defunikey, defmultikey, defmgmtkey;
if (new) if (new)
list_add(&new->list, &sdata->key_list); list_add_tail(&new->list, &sdata->key_list);
if (sta && pairwise) { if (sta && pairwise) {
rcu_assign_pointer(sta->ptk, new); rcu_assign_pointer(sta->ptk, new);