From 6e7cfd5823a53e689b4ea5235d02cf18dc59e11b Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Tue, 20 Jul 2010 12:09:11 -0400
Subject: [PATCH] --- yaml --- r: 203723 b: refs/heads/master c:
 3f6ff6bacdec217c98a60910c4804d11ce859820 h: refs/heads/master i:   203721:
 8fac74d1ce32efc37dd64343089431f6668f114b   203719:
 b1549e3fdf2712e13e7931fd967ecfaee3099264 v: v3

---
 [refs]                                   | 2 +-
 trunk/net/wireless/lib80211_crypt_tkip.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1fc4fe781e3a..5d7ba43cdb96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f366c5dabcb936dd5754a35188bd699181fe1ce
+refs/heads/master: 3f6ff6bacdec217c98a60910c4804d11ce859820
diff --git a/trunk/net/wireless/lib80211_crypt_tkip.c b/trunk/net/wireless/lib80211_crypt_tkip.c
index 8cbdb32ff316..a7f995613f1f 100644
--- a/trunk/net/wireless/lib80211_crypt_tkip.c
+++ b/trunk/net/wireless/lib80211_crypt_tkip.c
@@ -578,7 +578,7 @@ static void michael_mic_hdr(struct sk_buff *skb, u8 * hdr)
 	}
 
 	if (ieee80211_is_data_qos(hdr11->frame_control)) {
-		hdr[12] = le16_to_cpu(*ieee80211_get_qos_ctl(hdr11))
+		hdr[12] = le16_to_cpu(*((__le16 *)ieee80211_get_qos_ctl(hdr11)))
 			& IEEE80211_QOS_CTL_TID_MASK;
 	} else
 		hdr[12] = 0;		/* priority */