]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[PATCH] bcm43xx: correct "Move IV/ICV stripping into ieee80211_rx"
authorLarry Finger <Larry.Finger@lwfinger.net>
Wed, 8 Nov 2006 17:04:49 +0000 (11:04 -0600)
committerJeff Garzik <jeff@garzik.org>
Sat, 2 Dec 2006 05:12:04 +0000 (00:12 -0500)
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>
drivers/net/wireless/bcm43xx/bcm43xx_xmit.c

index a957bc8613820c16a935c9c816cd8f1b1d9a38aa..3e2462671690ac24169b436d4c16df288d07abf3 100644 (file)
@@ -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);