---

yaml --- r: 277768 b: refs/heads/master c: 68629c6 h: refs/heads/master v: v3
git-mirror · Nov 9, 2011 · 60b5915 · 60b5915
1 parent d0c7703
commit 60b5915
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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 */