Return-path: Received: from 42.mail-out.ovh.net ([213.251.189.42]:40844 "HELO 42.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S933105AbZKXOvM (ORCPT ); Tue, 24 Nov 2009 09:51:12 -0500 Message-ID: <4B0BF2E2.20307@free.fr> Date: Tue, 24 Nov 2009 15:51:14 +0100 From: Benoit PAPILLAULT MIME-Version: 1.0 To: lrodriguez@atheros.com CC: jmalinen@atheros.com, linux-wireless@vger.kernel.org, ath9k-devel@lists.ath9k.org Subject: Re: [PATCH] ath9k: This patch fix RX unpadding for any received frame. References: <1259074158-2101-1-git-send-email-benoit.papillault@free.fr> In-Reply-To: <1259074158-2101-1-git-send-email-benoit.papillault@free.fr> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: Oops... Disregard this one, it has been already applied. Regards, Benoit. Benoit Papillault a ?crit : > From: Benoit PAPILLAULT > > It has been tested with a 802.11 frame generator and by checking the FCS field > of each received frame with the value reported by the Atheros hardware. This > patch is useful if you are trying to analyze non standard 802.11 frame going > over the air. > > Signed-off-by: Benoit PAPILLAULT > --- > drivers/net/wireless/ath/ath9k/common.c | 19 ++++++++++++++----- > 1 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath9k/common.c b/drivers/net/wireless/ath/ath9k/common.c > index 2f1e161..4a13632 100644 > --- a/drivers/net/wireless/ath/ath9k/common.c > +++ b/drivers/net/wireless/ath/ath9k/common.c > @@ -231,26 +231,35 @@ void ath9k_cmn_rx_skb_postprocess(struct ath_common *common, > { > struct ath_hw *ah = common->ah; > struct ieee80211_hdr *hdr; > - int hdrlen, padsize; > + int hdrlen, padpos, padsize; > u8 keyix; > __le16 fc; > > /* see if any padding is done by the hw and remove it */ > hdr = (struct ieee80211_hdr *) skb->data; > hdrlen = ieee80211_get_hdrlen_from_skb(skb); > + padpos = 24; > fc = hdr->frame_control; > + if ((fc & cpu_to_le16(IEEE80211_FCTL_FROMDS|IEEE80211_FCTL_TODS)) == > + cpu_to_le16(IEEE80211_FCTL_FROMDS|IEEE80211_FCTL_TODS)) { > + padpos += 6; /* ETH_ALEN */ > + } > + if ((fc & cpu_to_le16(IEEE80211_STYPE_QOS_DATA|IEEE80211_FCTL_FTYPE)) == > + cpu_to_le16(IEEE80211_STYPE_QOS_DATA|IEEE80211_FTYPE_DATA)) { > + padpos += 2; > + } > > /* The MAC header is padded to have 32-bit boundary if the > * packet payload is non-zero. The general calculation for > * padsize would take into account odd header lengths: > - * padsize = (4 - hdrlen % 4) % 4; However, since only > + * padsize = (4 - padpos % 4) % 4; However, since only > * even-length headers are used, padding can only be 0 or 2 > * bytes and we can optimize this a bit. In addition, we must > * not try to remove padding from short control frames that do > * not have payload. */ > - padsize = hdrlen & 3; > - if (padsize && hdrlen >= 24) { > - memmove(skb->data + padsize, skb->data, hdrlen); > + padsize = padpos & 3; > + if (padsize && skb->len>=padpos+padsize+FCS_LEN) { > + memmove(skb->data + padsize, skb->data, padpos); > skb_pull(skb, padsize); > } > >