---

yaml --- r: 74509 b: refs/heads/master c: 8312512 h: refs/heads/master i: 74507: 13bb784 v: v3
git-mirror · Nov 29, 2007 · a8dc1b6 · a8dc1b6
1 parent 5d99b13
commit a8dc1b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b393f1dc76acbe65a97a4e51f8144f4a65fa1c9
+refs/heads/master: 8312512e81ab16d845b49d1ec695fad1c72f19f6
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
@@ -997,7 +997,7 @@ ieee80211_rx_h_drop_unencrypted(struct ieee80211_txrx_data *rx)
 	if (unlikely(!(rx->fc & IEEE80211_FCTL_PROTECTED) &&
 		     (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
 		     (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC &&
-		     rx->sdata->drop_unencrypted &&
+		     (rx->key || rx->sdata->drop_unencrypted) &&
 		     (rx->sdata->eapol == 0 || !ieee80211_is_eapol(rx->skb)))) {
 		if (net_ratelimit())
 			printk(KERN_DEBUG "%s: RX non-WEP frame, but expected "