---

yaml --- r: 258451 b: refs/heads/master c: f850e00 h: refs/heads/master i: 258449: 331e16f 258447: 5554ed3 v: v3
git-mirror · Jul 15, 2011 · ab005dc · ab005dc
1 parent 34b72b7
commit ab005dc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bca5d815311f53ada13b62f5e590df40fef317e
+refs/heads/master: f850e00fcd7767d01101e2f0a6d464bee8e48b47
diff --git a/trunk/include/net/mac80211.h b/trunk/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/trunk/net/mac80211/key.c b/trunk/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);