diff options
| author |   Zhu Yi <yi.zhu@intel.com> | 2006-08-21 11:32:31 +0800 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2006-08-29 17:06:30 -0400 |
| commit | 65b6a2775102cd81e57158ef4b1cb89641f76cfd (patch) | |
| tree | b470e6c38ebb5efd5d7749355d1226ba15f4e355 /net/ieee80211 | |
| parent | [PATCH] bcm43xx: return correct hard_start_xmit error code (diff) | |
| download | linux-dev-65b6a2775102cd81e57158ef4b1cb89641f76cfd.tar.xz linux-dev-65b6a2775102cd81e57158ef4b1cb89641f76cfd.zip | |
[PATCH] ieee80211: Fix header->qos_ctl endian issue
Signed-off-by: Jackie Wu <jackie.wu@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/ieee80211')
| -rw-r--r-- | net/ieee80211/ieee80211_crypt_tkip.c | 2 | ||||
| -rw-r--r-- | net/ieee80211/ieee80211_tx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c index 34dba0ba545d..a61b09ef70f2 100644 --- a/net/ieee80211/ieee80211_crypt_tkip.c +++ b/net/ieee80211/ieee80211_crypt_tkip.c @@ -528,7 +528,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] = le16_to_cpu(qoshdr->qos_ctl) & IEEE80211_QCTL_TID; + hdr[12] = qoshdr->qos_ctl & cpu_to_le16(IEEE80211_QCTL_TID); } else hdr[12] = 0; /* priority */ diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index bf042139c7ab..f2e61311552b 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c @@ -337,7 +337,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) hdr_len += 2; skb->priority = ieee80211_classify(skb); - header.qos_ctl |= skb->priority & IEEE80211_QCTL_TID; + header.qos_ctl |= cpu_to_le16(skb->priority & IEEE80211_QCTL_TID); } header.frame_ctl = cpu_to_le16(fc); |