Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65b6a277 authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

[PATCH] ieee80211: Fix header->qos_ctl endian issue 



Signed-off-by: default avatarJackie Wu <jackie.wu@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b6971c21

net/ieee80211/ieee80211_crypt_tkip.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

net/ieee80211/ieee80211_tx.c

+1 −1
Original line number Diff line number Diff line
@@ -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);