mac80211: make ieee80211_downgrade_queue static

There's no reason for it to not be static.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 20 insertions, 23 deletions

diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 89511be3111..b3d4ee044e7 100644
--- a/net/mac80211/wme.c
+++ b/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/net/mac80211/wme.h b/net/mac80211/wme.h
index 94edceb617f..ca80818b7b6 100644
--- a/net/mac80211/wme.h
+++ b/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 */