diff options
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r-- | net/mac80211/rx.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 306eadb01fc..52e4554fdde 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -1077,12 +1077,9 @@ ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx) | |||
1077 | if (unlikely(!(rx->fc & IEEE80211_FCTL_PROTECTED) && | 1077 | if (unlikely(!(rx->fc & IEEE80211_FCTL_PROTECTED) && |
1078 | (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA && | 1078 | (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA && |
1079 | (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC && | 1079 | (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC && |
1080 | (rx->key || rx->sdata->drop_unencrypted))) { | 1080 | (rx->key || rx->sdata->drop_unencrypted))) |
1081 | if (net_ratelimit()) | ||
1082 | printk(KERN_DEBUG "%s: RX non-WEP frame, but expected " | ||
1083 | "encryption\n", rx->dev->name); | ||
1084 | return -EACCES; | 1081 | return -EACCES; |
1085 | } | 1082 | |
1086 | return 0; | 1083 | return 0; |
1087 | } | 1084 | } |
1088 | 1085 | ||