From 60b5915270f2c1ae71a45895b7d39e3518c83168 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 3 Nov 2011 09:59:39 +0100 Subject: [PATCH] --- yaml --- r: 277768 b: refs/heads/master c: 68629c6133304f286a1f0c12d9aa8071a639f076 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/wme.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dfdd7f8ebecf..ba1631693c7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 819622678ed7011b4d785ca174de5d4bf179bf83 +refs/heads/master: 68629c6133304f286a1f0c12d9aa8071a639f076 diff --git a/trunk/net/mac80211/wme.c b/trunk/net/mac80211/wme.c index fd52e695c071..d0240bba45f3 100644 --- a/trunk/net/mac80211/wme.c +++ b/trunk/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 */