[PATCH] b43: include FCS at end of frames

[PATCH] b43: include FCS at end of frames

[Johannes Berg]

This patch makes b43 include the FCS at the end of
received frames, useful for monitoring.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

---
 drivers/net/wireless/b43/main.c |    3 ++-
 drivers/net/wireless/b43/xmit.c |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

--- wireless-dev.orig/drivers/net/wireless/b43/main.c	2007-08-24 12:57:04.949420431 +0200
+++ wireless-dev/drivers/net/wireless/b43/main.c	2007-08-24 13:00:08.989420431 +0200
@@ -3934,7 +3934,8 @@ static int b43_wireless_init(struct ssb_
 	}
 
 	/* fill hw info */
-	hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE;
+	hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE |
+		    IEEE80211_HW_RX_INCLUDES_FCS;
 	hw->max_signal = 100;
 	hw->max_rssi = -110;
 	hw->max_noise = -110;
--- wireless-dev.orig/drivers/net/wireless/b43/xmit.c	2007-08-24 12:57:04.959420431 +0200
+++ wireless-dev/drivers/net/wireless/b43/xmit.c	2007-08-24 13:00:08.999420431 +0200
@@ -481,7 +481,6 @@ void b43_rx(struct b43_wldev *dev, struc
 	}
 	wlhdr = (struct ieee80211_hdr *)(skb->data);
 	fctl = le16_to_cpu(wlhdr->frame_control);
-	skb_trim(skb, skb->len - FCS_LEN);
 
 	if ((macstat & B43_RX_MAC_DEC) && !(macstat & B43_RX_MAC_DECERR)) {
 		unsigned int keyidx;

Re: [PATCH] b43: include FCS at end of frames

[Holger Schurig]

> b43_wireless_init(struct ssb_ }
>
>  	/* fill hw info */
> -	hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE;
> +	hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE |
> +		    IEEE80211_HW_RX_INCLUDES_FCS;
>  	hw->max_signal = 100;

You must have a very different tree to wireless-dev, branch everything.
According to git blame, since 2007-08-13 the piece of code there looks
like this:

hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE |
            IEEE80211_HW_MONITOR_DURING_OPER |
            IEEE80211_HW_DEVICE_HIDES_WEP | IEEE80211_HW_WEP_INCLUDE_IV;

The patch subject in this mailing list was
"[RFC 5/10] Port of bcm43xx from softmac to mac80211"

Re: [PATCH] b43: include FCS at end of frames

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

On Fri, 2007-08-24 at 15:12 +0200, Holger Schurig wrote:

> You must have a very different tree to wireless-dev, branch everything.
> According to git blame, since 2007-08-13 the piece of code there looks
> like this:

After my patches, yeah. I screwed up, shouldn't have posted this yet.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 190 bytes --]