diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-10-26 17:04:29 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-16 08:27:38 -0800 |
| commit | 31a1d25a569e52f5dc05b6b63a30ea9dcc95677b (patch) | |
| tree | 4277fa75a54edf9e6dc5716c1ed81974c5faf2a4 /net | |
| parent | 0ac38060c5e1e12e851ed3e281597286b57f9ad1 (diff) | |
| download | linux-stable-31a1d25a569e52f5dc05b6b63a30ea9dcc95677b.tar.gz linux-stable-31a1d25a569e52f5dc05b6b63a30ea9dcc95677b.tar.bz2 linux-stable-31a1d25a569e52f5dc05b6b63a30ea9dcc95677b.zip | |
ieee80211: fix TKIP QoS bug
patch e797aa1b7da6bfcb2e19a10ae5ead9aa7aea732b in mainline.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -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 5a48d8e0aec1..7f11dd935b71 100644 --- a/net/ieee80211/ieee80211_crypt_tkip.c +++ b/net/ieee80211/ieee80211_crypt_tkip.c @@ -584,7 +584,7 @@ static void michael_mic_hdr(struct sk_buff *skb, u8 * hdr) if (stype & IEEE80211_STYPE_QOS_DATA) { const struct ieee80211_hdr_3addrqos *qoshdr = (struct ieee80211_hdr_3addrqos *)skb->data; - hdr[12] = qoshdr->qos_ctl & cpu_to_le16(IEEE80211_QCTL_TID); + hdr[12] = le16_to_cpu(qoshdr->qos_ctl) & IEEE80211_QCTL_TID; } else hdr[12] = 0; /* priority */ |