diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-07-13 19:50:53 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-15 13:38:33 -0400 |
| commit | f850e00fcd7767d01101e2f0a6d464bee8e48b47 (patch) | |
| tree | c90d77261e09a6304e1b507c363e4ff66bc61b8d | |
| parent | 8bca5d815311f53ada13b62f5e590df40fef317e (diff) | |
| download | linux-3.10-f850e00fcd7767d01101e2f0a6d464bee8e48b47.tar.gz linux-3.10-f850e00fcd7767d01101e2f0a6d464bee8e48b47.tar.bz2 linux-3.10-f850e00fcd7767d01101e2f0a6d464bee8e48b47.zip | |
mac80211: let key iteration get keys in install order
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>
| -rw-r--r-- | include/net/mac80211.h | 4 | ||||
| -rw-r--r-- | net/mac80211/key.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 9e91b4f4784..972109f06a7 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -2987,6 +2987,10 @@ void ieee80211_sta_block_awake(struct ieee80211_hw *hw, * needs reprogramming of the keys during suspend. Note that due * 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. + * + * 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, struct ieee80211_vif *vif, diff --git a/net/mac80211/key.c b/net/mac80211/key.c index 739bee13e81..5150c6d11b5 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c @@ -278,7 +278,7 @@ static void __ieee80211_key_replace(struct ieee80211_sub_if_data *sdata, bool defunikey, defmultikey, defmgmtkey; if (new) - list_add(&new->list, &sdata->key_list); + list_add_tail(&new->list, &sdata->key_list); if (sta && pairwise) { rcu_assign_pointer(sta->ptk, new); |