aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-04-13 04:12:47 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-04-15 15:04:36 -0400
commitb3fc9c6c58c986f7a24fd8b0794d1e0794935a28 (patch)
tree1556dbab26c37c438ea6bc980bc05143a10c4c86 /net
parent2dd0f69222c481574baf6a4affb9256a7c7410e7 (diff)
mac80211: remove message on receiving unexpected unencrypted frames
Some people are getting this message a lot, and we have traced it to broken access points that much too often send completely empty frames (all bytes zeroed, which they shouldn't do at all.) Since we cannot do anything about such frames in any case except the special case where we're debugging an AP, just remove the message. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/rx.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 535407d07fa4..a8a40aba846b 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1050,12 +1050,9 @@ ieee80211_drop_unencrypted(struct ieee80211_txrx_data *rx)
1050 if (unlikely(!(rx->fc & IEEE80211_FCTL_PROTECTED) && 1050 if (unlikely(!(rx->fc & IEEE80211_FCTL_PROTECTED) &&
1051 (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA && 1051 (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
1052 (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC && 1052 (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC &&
1053 (rx->key || rx->sdata->drop_unencrypted))) { 1053 (rx->key || rx->sdata->drop_unencrypted)))
1054 if (net_ratelimit())
1055 printk(KERN_DEBUG "%s: RX non-WEP frame, but expected "
1056 "encryption\n", rx->dev->name);
1057 return -EACCES; 1054 return -EACCES;
1058 } 1055
1059 return 0; 1056 return 0;
1060} 1057}
1061 1058