From f368a0eedc4451c14fa7e7b34622e335dc7616ff Mon Sep 17 00:00:00 2001
From: Mariusz Kozlowski <mk@lab.zgora.pl>
Date: Sat, 26 Mar 2011 18:58:51 +0100
Subject: [PATCH] --- yaml --- r: 243695 b: refs/heads/master c:
 67aa030c0dff6095128bcb4e8043b48360f32331 h: refs/heads/master i:   243693:
 9af949a00d27da53da769590826a57d4b58dd63a   243691:
 09668ce12c8e67731b746984bf8cdde3212d8a44   243687:
 926ebaa84a1c09c97662b6883206e6b755cf8995   243679:
 77021b65ba1ee812a39cf4e5703a12cdbf60e163 v: v3

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

diff --git a/[refs] b/[refs]
index b87dc8fdcbaf..c1e8482954a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f951a7f8ba05192291f781ef99a892697e47d62
+refs/heads/master: 67aa030c0dff6095128bcb4e8043b48360f32331
diff --git a/trunk/net/mac80211/key.c b/trunk/net/mac80211/key.c
index 09cf1f28c12b..af3c56482c80 100644
--- a/trunk/net/mac80211/key.c
+++ b/trunk/net/mac80211/key.c
@@ -400,11 +400,12 @@ int ieee80211_key_link(struct ieee80211_key *key,
 {
 	struct ieee80211_key *old_key;
 	int idx, ret;
-	bool pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE;
+	bool pairwise;
 
 	BUG_ON(!sdata);
 	BUG_ON(!key);
 
+	pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE;
 	idx = key->conf.keyidx;
 	key->local = sdata->local;
 	key->sdata = sdata;