From a932c8fe3746861f2d40737ef2ffc94c1c32ab2a Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 27 Mar 2012 14:18:38 +0200
Subject: [PATCH] --- yaml --- r: 300673 b: refs/heads/master c:
 4670cf7a84dfbc3c5a9b50a12afdee0003a40ed8 h: refs/heads/master i:   300671:
 74be49a5d28cb33bab28a6dae1d2b92fdc30bb29 v: v3

---
 [refs]                   |  2 +-
 trunk/net/mac80211/wme.c | 40 ++++++++++++++++++++--------------------
 trunk/net/mac80211/wme.h |  3 ---
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 52d81a67a35e..06dc93475924 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4875d30df594eb47746b16073067e316968edd53
+refs/heads/master: 4670cf7a84dfbc3c5a9b50a12afdee0003a40ed8
diff --git a/trunk/net/mac80211/wme.c b/trunk/net/mac80211/wme.c
index 89511be3111e..b3d4ee044e7c 100644
--- a/trunk/net/mac80211/wme.c
+++ b/trunk/net/mac80211/wme.c
@@ -52,6 +52,26 @@ static int wme_downgrade_ac(struct sk_buff *skb)
 	}
 }
 
+static u16 ieee80211_downgrade_queue(struct ieee80211_local *local,
+				     struct sk_buff *skb)
+{
+	/* in case we are a client verify acm is not set for this ac */
+	while (unlikely(local->wmm_acm & BIT(skb->priority))) {
+		if (wme_downgrade_ac(skb)) {
+			/*
+			 * This should not really happen. The AP has marked all
+			 * lower ACs to require admission control which is not
+			 * a reasonable configuration. Allow the frame to be
+			 * transmitted using AC_BK as a workaround.
+			 */
+			break;
+		}
+	}
+
+	/* look up which queue to use for frames with this 1d tag */
+	return ieee802_1d_to_ac[skb->priority];
+}
+
 /* Indicate which queue to use for this fully formed 802.11 frame */
 u16 ieee80211_select_queue_80211(struct ieee80211_local *local,
 				 struct sk_buff *skb,
@@ -139,26 +159,6 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
 	return ieee80211_downgrade_queue(local, skb);
 }
 
-u16 ieee80211_downgrade_queue(struct ieee80211_local *local,
-			      struct sk_buff *skb)
-{
-	/* in case we are a client verify acm is not set for this ac */
-	while (unlikely(local->wmm_acm & BIT(skb->priority))) {
-		if (wme_downgrade_ac(skb)) {
-			/*
-			 * This should not really happen. The AP has marked all
-			 * lower ACs to require admission control which is not
-			 * a reasonable configuration. Allow the frame to be
-			 * transmitted using AC_BK as a workaround.
-			 */
-			break;
-		}
-	}
-
-	/* look up which queue to use for frames with this 1d tag */
-	return ieee802_1d_to_ac[skb->priority];
-}
-
 void ieee80211_set_qos_hdr(struct ieee80211_sub_if_data *sdata,
 			   struct sk_buff *skb)
 {
diff --git a/trunk/net/mac80211/wme.h b/trunk/net/mac80211/wme.h
index 94edceb617ff..ca80818b7b66 100644
--- a/trunk/net/mac80211/wme.h
+++ b/trunk/net/mac80211/wme.h
@@ -22,8 +22,5 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
 			   struct sk_buff *skb);
 void ieee80211_set_qos_hdr(struct ieee80211_sub_if_data *sdata,
 			   struct sk_buff *skb);
-u16 ieee80211_downgrade_queue(struct ieee80211_local *local,
-                              struct sk_buff *skb);
-
 
 #endif /* _WME_H */