diff --git a/[refs] b/[refs] index 9ae3718bad09..9b96e7d50883 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecbcd3243651ae8ac2b73a96c320992a4cf01c5b +refs/heads/master: fa83a2189870cdcd6fb4deeed391e0b988dc9a19 diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c index 11ed5aa90f83..ea71e1abc4c8 100644 --- a/trunk/net/mac80211/rx.c +++ b/trunk/net/mac80211/rx.c @@ -1421,8 +1421,7 @@ ieee80211_drop_unencrypted_mgmt(struct ieee80211_rx_data *rx) return -EACCES; /* BIP does not use Protected field, so need to check MMIE */ if (unlikely(ieee80211_is_multicast_robust_mgmt_frame(rx->skb) && - ieee80211_get_mmie_keyidx(rx->skb) < 0 && - rx->key)) + ieee80211_get_mmie_keyidx(rx->skb) < 0)) return -EACCES; /* * When using MFP, Action frames are not allowed prior to