diff --git a/[refs] b/[refs]
index d476e670350a..4209b3bc9293 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b92f7d30830a319148df2943b7565989494e5ad1
+refs/heads/master: f12553ebe045a8a40ab33fa500fb57d10706e226
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index da557b0d0114..fcfa988a37a3 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -557,7 +557,7 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
 			break;
 		}
 
-		if (!skip_hw &&
+		if (!skip_hw && tx->key &&
 		    tx->key->conf.flags & KEY_FLAG_UPLOADED_TO_HARDWARE)
 			info->control.hw_key = &tx->key->conf;
 	}