From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from he.sipsolutions.net ([78.46.109.217]:56588 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751881Ab1EIOqo (ORCPT ); Mon, 9 May 2011 10:46:44 -0400 Subject: Re: [PATCH] mac80211: don't drop frames where skb->len < 24 in ieee80211_scan_rx() From: Johannes Berg To: Luciano Coelho Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org In-Reply-To: <1304950753-2952-1-git-send-email-coelho@ti.com> References: <1304950753-2952-1-git-send-email-coelho@ti.com> Content-Type: text/plain; charset="UTF-8" Date: Mon, 09 May 2011 16:46:39 +0200 Message-ID: <1304952399.12202.3.camel@jlt3.sipsolutions.net> (sfid-20110509_164647_544803_A1CBDB6B) Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Mon, 2011-05-09 at 17:19 +0300, Luciano Coelho wrote: > 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. > > Cc: Johannes Berg > Signed-off-by: Luciano Coelho > --- > net/mac80211/scan.c | 3 --- > 1 files changed, 0 insertions(+), 3 deletions(-) > > diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c > index 489b6ad..b7a39c4 100644 > --- a/net/mac80211/scan.c > +++ b/net/mac80211/scan.c > @@ -169,9 +169,6 @@ ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb) > if (ieee80211_is_ctl(fc)) > return RX_CONTINUE; > > - if (skb->len < 24) > - return RX_DROP_MONITOR; > - You can't just delete it, we use mgmt->da at least in this code path. You should just change RX_DROP_MONITOR to RX_CONTINUe here I think. johannes