summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-11-03 09:59:39 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-11-09 16:01:01 -0500
commit68629c6133304f286a1f0c12d9aa8071a639f076 (patch)
tree6c1809d912dba4bb62c9ebc327c6f68729740002
parent819622678ed7011b4d785ca174de5d4bf179bf83 (diff)
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: Janusz Dziedzic <janusz.dziedzic@gmail.com> Tested-by: Janusz Dziedzic <janusz.dziedzic@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/wme.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index fd52e695c071..d0240bba45f3 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -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 */