From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Wed, 8 Nov 2006 17:04:49 +0000 (-0600)
Subject: [PATCH] bcm43xx: correct "Move IV/ICV stripping into ieee80211_rx"
X-Git-Tag: v2.6.20-rc2~6^2~13^2~468^2~46
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b6d2b1db0637ff35127f3cc38c04f289a0ee0579;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
index a957bc86138..3e246267169 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);