From b1a6a032c36ba85c1f2e0f16ab78ef7752f85f7e Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sat, 1 Mar 2008 19:32:18 +0100
Subject: [PATCH] --- yaml --- r: 90090 b: refs/heads/master c:
 96c46546e28282a743b97f26e94c7565350898b7 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/mac80211/key.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 34dbd127fa0a..7baf5c4623f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38968d096b9f497e7ec4590b6b80eb8679e3646a
+refs/heads/master: 96c46546e28282a743b97f26e94c7565350898b7
diff --git a/trunk/net/mac80211/key.c b/trunk/net/mac80211/key.c
index 166d0f00d135..f91fb4092652 100644
--- a/trunk/net/mac80211/key.c
+++ b/trunk/net/mac80211/key.c
@@ -174,6 +174,9 @@ static void __ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
 {
 	int idx, defkey;
 
+	if (new)
+		list_add(&new->list, &sdata->key_list);
+
 	if (sta) {
 		rcu_assign_pointer(sta->key, new);
 	} else {
@@ -190,9 +193,6 @@ static void __ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
 			ieee80211_set_default_key(sdata, -1);
 
 		rcu_assign_pointer(sdata->keys[idx], new);
-		if (new)
-			list_add(&new->list, &sdata->key_list);
-
 		if (defkey && new)
 			ieee80211_set_default_key(sdata, new->conf.keyidx);
 	}