Commit d8be11ee authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller

b43: include FCS in frames handed to mac80211

Sometimes it can be useful to see the FCS, especially when
bad-FCS frames are shown. Pass the FCS to mac80211 and let
it worry about snipping it off when required.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d42ce84a
...@@ -3904,7 +3904,8 @@ static int b43_wireless_init(struct ssb_device *dev) ...@@ -3904,7 +3904,8 @@ static int b43_wireless_init(struct ssb_device *dev)
} }
/* fill hw info */ /* 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_signal = 100;
hw->max_rssi = -110; hw->max_rssi = -110;
hw->max_noise = -110; hw->max_noise = -110;
......
...@@ -489,7 +489,6 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) ...@@ -489,7 +489,6 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
} }
wlhdr = (struct ieee80211_hdr *)(skb->data); wlhdr = (struct ieee80211_hdr *)(skb->data);
fctl = le16_to_cpu(wlhdr->frame_control); fctl = le16_to_cpu(wlhdr->frame_control);
skb_trim(skb, skb->len - FCS_LEN);
if (macstat & B43_RX_MAC_DEC) { if (macstat & B43_RX_MAC_DEC) {
unsigned int keyidx; unsigned int keyidx;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment