aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2006-11-08 11:04:49 -0600
committerJeff Garzik <jeff@garzik.org>2006-12-02 00:12:04 -0500
commitb6d2b1db0637ff35127f3cc38c04f289a0ee0579 (patch)
treed393d3437f43de8855bd1f26b2741305ed5f62da /drivers
parentRevert "[PATCH] Add support for Marvell 88e1111S and 88e1145" (diff)
downloadlinux-dev-b6d2b1db0637ff35127f3cc38c04f289a0ee0579.tar.xz
linux-dev-b6d2b1db0637ff35127f3cc38c04f289a0ee0579.zip
[PATCH] bcm43xx: correct "Move IV/ICV stripping into ieee80211_rx"
In the patch sent by Daniel Drake under the title "[PATCH] ieee80211: Move IV/ICV stripping into ieee80211_rx", a needed line was accidentally removed. (NOTE: I'm pretty sure this was my fault, not Daniel's. -- JWL) Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_xmit.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
index a957bc861382..3e2462671690 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
@@ -543,6 +543,7 @@ int bcm43xx_rx(struct bcm43xx_private *bcm,
break;
}
+ frame_ctl = le16_to_cpu(wlhdr->frame_ctl);
switch (WLAN_FC_GET_TYPE(frame_ctl)) {
case IEEE80211_FTYPE_MGMT:
ieee80211_rx_mgt(bcm->ieee, wlhdr, &stats);