---

yaml --- r: 203723 b: refs/heads/master c: 3f6ff6b h: refs/heads/master i: 203721: 8fac74d 203719: b1549e3 v: v3
git-mirror · Jul 20, 2010 · 6e7cfd5 · 6e7cfd5
1 parent bbf5d92
commit 6e7cfd5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 */