aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/b43/main.c3
-rw-r--r--drivers/net/wireless/b43/xmit.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 58847222cf0b..69c68c29dd93 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3904,7 +3904,8 @@ static int b43_wireless_init(struct ssb_device *dev)
3904 } 3904 }
3905 3905
3906 /* fill hw info */ 3906 /* fill hw info */
3907 hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE; 3907 hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE |
3908 IEEE80211_HW_RX_INCLUDES_FCS;
3908 hw->max_signal = 100; 3909 hw->max_signal = 100;
3909 hw->max_rssi = -110; 3910 hw->max_rssi = -110;
3910 hw->max_noise = -110; 3911 hw->max_noise = -110;
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index 557abe1f1a05..a455a6beac4a 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -489,7 +489,6 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
489 } 489 }
490 wlhdr = (struct ieee80211_hdr *)(skb->data); 490 wlhdr = (struct ieee80211_hdr *)(skb->data);
491 fctl = le16_to_cpu(wlhdr->frame_control); 491 fctl = le16_to_cpu(wlhdr->frame_control);
492 skb_trim(skb, skb->len - FCS_LEN);
493 492
494 if (macstat & B43_RX_MAC_DEC) { 493 if (macstat & B43_RX_MAC_DEC) {
495 unsigned int keyidx; 494 unsigned int keyidx;