---

yaml --- r: 194167 b: refs/heads/master c: fa83a21 h: refs/heads/master i: 194165: aa254ed 194163: d4fb30b 194159: ae1f3cb v: v3
git-mirror · Mar 31, 2010 · 63eef80 · 63eef80
1 parent 72c1fd4
commit 63eef80
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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