---

yaml --- r: 279375 b: refs/heads/master c: aef6c92 h: refs/heads/master i: 279373: 72fafcc 279371: 5c7f63f 279367: f72736a 279359: 725da82 v: v3
git-mirror · Dec 21, 2011 · 73c2333 · 73c2333
1 parent 06c9213
commit 73c2333
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3aebee028aa8eb8ed49b7dbd52dfb841f6dc8dff
+refs/heads/master: aef6c928a92481f75fbd548eb8c1e840912444b8
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
@@ -1827,7 +1827,12 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
 	}
 
 	if (xmit_skb) {
-		/* send to wireless media */
+		/*
+		 * Send to wireless media and increase priority by 256 to
+		 * keep the received priority instead of reclassifying
+		 * the frame (see cfg80211_classify8021d).
+		 */
+		xmit_skb->priority += 256;
 		xmit_skb->protocol = htons(ETH_P_802_3);
 		skb_reset_network_header(xmit_skb);
 		skb_reset_mac_header(xmit_skb);