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;