diff --git a/[refs] b/[refs]
index 3a8ffcecc6cd..9ae3718bad09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e69e95dbecfb73f76765cdd16dadc6219a9068e3
+refs/heads/master: ecbcd3243651ae8ac2b73a96c320992a4cf01c5b
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 08e1f17a4226..350096afe79a 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -513,6 +513,8 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
 	else if (tx->sta && (key = rcu_dereference(tx->sta->key)))
 		tx->key = key;
 	else if (ieee80211_is_mgmt(hdr->frame_control) &&
+		 is_multicast_ether_addr(hdr->addr1) &&
+		 ieee80211_is_robust_mgmt_frame(hdr) &&
 		 (key = rcu_dereference(tx->sdata->default_mgmt_key)))
 		tx->key = key;
 	else if ((key = rcu_dereference(tx->sdata->default_key)))