diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-10-15 10:50:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-10-16 20:58:12 -0400 |
| commit | e797aa1b7da6bfcb2e19a10ae5ead9aa7aea732b (patch) | |
| tree | 65f0bc18f772ee539b714fd4613bb421a90f0327 /net/ieee80211 | |
| parent | 65a6ec0d72a07f16719e9b7a96e1c4bae044b591 (diff) | |
[PATCH] ieee80211: fix TKIP QoS bug
The commit 65b6a277 titled "ieee80211: Fix header->qos_ctl endian issue"
*introduced* an endianness bug. Partially revert it.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/ieee80211')
| -rw-r--r-- | net/ieee80211/ieee80211_crypt_tkip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c index 6cc54eeca3ed..72e6ab66834f 100644 --- a/net/ieee80211/ieee80211_crypt_tkip.c +++ b/net/ieee80211/ieee80211_crypt_tkip.c | |||
| @@ -586,7 +586,7 @@ static void michael_mic_hdr(struct sk_buff *skb, u8 * hdr) | |||
| 586 | if (stype & IEEE80211_STYPE_QOS_DATA) { | 586 | if (stype & IEEE80211_STYPE_QOS_DATA) { |
| 587 | const struct ieee80211_hdr_3addrqos *qoshdr = | 587 | const struct ieee80211_hdr_3addrqos *qoshdr = |
| 588 | (struct ieee80211_hdr_3addrqos *)skb->data; | 588 | (struct ieee80211_hdr_3addrqos *)skb->data; |
| 589 | hdr[12] = qoshdr->qos_ctl & cpu_to_le16(IEEE80211_QCTL_TID); | 589 | hdr[12] = le16_to_cpu(qoshdr->qos_ctl) & IEEE80211_QCTL_TID; |
| 590 | } else | 590 | } else |
| 591 | hdr[12] = 0; /* priority */ | 591 | hdr[12] = 0; /* priority */ |
| 592 | 592 | ||