diff --git a/[refs] b/[refs]
index 97fa6cdc622e..eb03c90a928b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdacbcda7f21ba684cb4426daed67e23003d8311
+refs/heads/master: e0830f71e7b8c2c58031c9692384819943162e9b
diff --git a/trunk/net/mac80211/wpa.c b/trunk/net/mac80211/wpa.c
index 13efab5bf12a..106e15a4649f 100644
--- a/trunk/net/mac80211/wpa.c
+++ b/trunk/net/mac80211/wpa.c
@@ -415,7 +415,8 @@ static int ccmp_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
 	memmove(pos, pos + CCMP_HDR_LEN, hdrlen);
 
 	/* the HW only needs room for the IV, but not the actual IV */
-	if (info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)
+	if (info->control.hw_key &&
+	    (info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE))
 		return 0;
 
 	hdr = (struct ieee80211_hdr *) pos;