diff --git a/[refs] b/[refs]
index 844adb1a91bc..956442a780b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f4a6fae46a214c4dce3bd63a6219a5f1c818c78
+refs/heads/master: 00eb7fe77eb455f807c396f9917f0f623d4c84bb
diff --git a/trunk/net/mac80211/key.c b/trunk/net/mac80211/key.c
index 150d66dbda9d..220e83be3ef4 100644
--- a/trunk/net/mac80211/key.c
+++ b/trunk/net/mac80211/key.c
@@ -380,6 +380,15 @@ void ieee80211_key_free(struct ieee80211_key *key)
 	if (!key)
 		return;
 
+	if (!key->sdata) {
+		/* The key has not been linked yet, simply free it
+		 * and don't Oops */
+		if (key->conf.alg == ALG_CCMP)
+			ieee80211_aes_key_free(key->u.ccmp.tfm);
+		kfree(key);
+		return;
+	}
+
 	spin_lock_irqsave(&key->sdata->local->key_lock, flags);
 	__ieee80211_key_free(key);
 	spin_unlock_irqrestore(&key->sdata->local->key_lock, flags);