summaryrefslogtreecommitdiff
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-06-16 16:05:57 +0300
committerJohannes Berg <johannes.berg@intel.com>2015-07-17 16:37:55 +0300
commit9ad8b21b742503030d543cd272de6a4eb3e3cc27 (patch)
tree690c6fcf6d5de3f0985ad5ac30f691d8cfcfec4a /net/mac80211/rx.c
parent16bf948081d0ea0f6cdef54b79a0250d4b099970 (diff)
downloadlinux-9ad8b21b742503030d543cd272de6a4eb3e3cc27.tar.xz
mac80211: remove short frame test and counter
Short frames less than 16 octets are already blocked in the monitor code by the should_drop_frame() function, and cannot get into the regular RX path. Therefore, this check can never trigger and the counter invariably stays zero. Remove the useless code. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 9fb8ce982c2d..aa57a2ab8245 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1093,11 +1093,6 @@ ieee80211_rx_h_check(struct ieee80211_rx_data *rx)
{
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
- if (unlikely(rx->skb->len < 16)) {
- I802_DEBUG_INC(rx->local->rx_handlers_drop_short);
- return RX_DROP_MONITOR;
- }
-
/* Drop disallowed frame classes based on STA auth/assoc state;
* IEEE 802.11, Chap 5.5.
*