Commit 306fe938 authored May 09, 2011 by Luciano Coelho Committed by John W. Linville May 10, 2011

mac80211: don't drop frames where skb->len < 24 in ieee80211_scan_rx()



This seems to be a leftover from the old days, when we didn't support
any frames that didn't contain the full ieee802.11 header.  This is
not the case anymore.  It does not cause problems now, because they
are only dropped during scan.  But when scheduled scans get merged,
this would become a problem because we would drop all small frames
while scheduled scan is running.

To fix this, return RX_CONTINUE instead of RX_DROP_MONITOR.

Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 729da390

net/mac80211/scan.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ ieee80211_scan_rx(struct ieee80211_sub_if_data sdata, struct sk_buff skb)
		return RX_CONTINUE;

		if (skb->len < 24)
		return RX_DROP_MONITOR;
		return RX_CONTINUE;

		presp = ieee80211_is_probe_resp(fc);
		if (presp) {

Admin message