From 73c233390ad51e18242c190de645c2f496ca3ba7 Mon Sep 17 00:00:00 2001
From: Helmut Schaa <helmut.schaa@googlemail.com>
Date: Wed, 21 Dec 2011 09:11:35 +0100
Subject: [PATCH] --- yaml --- r: 279375 b: refs/heads/master c:
 aef6c928a92481f75fbd548eb8c1e840912444b8 h: refs/heads/master i:   279373:
 72fafcc346a91623545a1ad73b1b8f46ffc9a738   279371:
 5c7f63f5125cad0ac40dcf953c2dcc7f1b9e0082   279367:
 f72736a605a552ef3ad74fbe83827feb93fc2edc   279359:
 725da82171d0aab67574e40703023bf20f7d6694 v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/rx.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 15221324df1f..da970d1dfdd3 100644
--- 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
index 57832eb44f3e..59f124c58333 100644
--- 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);