diff --git a/[refs] b/[refs]
index 249101c94999..6f5b100e1dc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46e6de159ddebc179cbae60fd7b728f57c39964b
+refs/heads/master: 4922f71f2506e36d81a03f8fec4559bb7d175bf7
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index a79fd868566d..b755e778b0c4 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -552,6 +552,9 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
 		 !(ieee80211_is_action(hdr->frame_control) &&
 		   tx->sta && test_sta_flag(tx->sta, WLAN_STA_MFP)))
 		tx->key = NULL;
+	else if (ieee80211_is_mgmt(hdr->frame_control) &&
+		 !ieee80211_is_robust_mgmt_frame(hdr))
+		tx->key = NULL;
 	else {
 		I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
 		return TX_DROP;