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

Commit 68629c61 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: preserve EOSP in QoS header 



Janusz reported that the EOSP bit in mac80211 was
getting cleared all the time. I had not found this
since I tested uAPSD with a device that always set
the bit itself. Preserve the bit when building the
QoS header.

Reported-by: default avatarJanusz Dziedzic <janusz.dziedzic@gmail.com>
Tested-by: default avatarJanusz Dziedzic <janusz.dziedzic@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 81962267

net/mac80211/wme.c

+4 −1
Original line number Diff line number Diff line
@@ -143,10 +143,13 @@ void ieee80211_set_qos_hdr(struct ieee80211_sub_if_data *sdata, 
	/* Fill in the QoS header if there is one. */

	if (ieee80211_is_data_qos(hdr->frame_control)) {

		u8 *p = ieee80211_get_qos_ctl(hdr);

		u8 ack_policy = 0, tid;

		u8 ack_policy, tid;



		tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;



		/* preserve EOSP bit */

		ack_policy = *p & IEEE80211_QOS_CTL_EOSP;



		if (unlikely(sdata->local->wifi_wme_noack_test))

			ack_policy |= IEEE80211_QOS_CTL_ACK_POLICY_NOACK;

		/* qos header is 2 bytes */