From 06464b088a5930447fa47825301a5aeb80c5ce7f Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sat, 24 Nov 2007 15:06:33 +0100
Subject: [PATCH] --- yaml --- r: 79023 b: refs/heads/master c:
 d8be11ee95be9ec9eabfec9f635e0feac972369b h: refs/heads/master i:   79021:
 f23ebd6f2a1019b1fa5527ba3f5723c6547483e0   79019:
 68c295f626026e15eaf3c61dad73c516b7fd7949   79015:
 bbc36a7427192923e44d3a805760c689660c14b4   79007:
 44773bccce094a54360122127309ab9ffde89213 v: v3

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

diff --git a/[refs] b/[refs]
index 4c7c5cdc51c3..defcfc06244d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d42ce84a05d7a427df22894de268c1b4473f6004
+refs/heads/master: d8be11ee95be9ec9eabfec9f635e0feac972369b
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
index 58847222cf0b..69c68c29dd93 100644
--- a/trunk/drivers/net/wireless/b43/main.c
+++ b/trunk/drivers/net/wireless/b43/main.c
@@ -3904,7 +3904,8 @@ static int b43_wireless_init(struct ssb_device *dev)
 	}
 
 	/* 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;
diff --git a/trunk/drivers/net/wireless/b43/xmit.c b/trunk/drivers/net/wireless/b43/xmit.c
index 557abe1f1a05..a455a6beac4a 100644
--- a/trunk/drivers/net/wireless/b43/xmit.c
+++ b/trunk/drivers/net/wireless/b43/xmit.c
@@ -489,7 +489,6 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
 	}
 	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) {
 		unsigned int keyidx;