Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / mac80211 / wme.c

diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 34e6d02da779f89731a33261745eea8949d14490..28bc084dbfb95ecc5a91fbc81800e200b63550bd 100644 (file)
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -21,7 +21,16 @@
 /* Default mapping in classifier to work with default
  * queue setup.
  */
-const int ieee802_1d_to_ac[8] = { 2, 3, 3, 2, 1, 1, 0, 0 };
+const int ieee802_1d_to_ac[8] = {
+       IEEE80211_AC_BE,
+       IEEE80211_AC_BK,
+       IEEE80211_AC_BK,
+       IEEE80211_AC_BE,
+       IEEE80211_AC_VI,
+       IEEE80211_AC_VI,
+       IEEE80211_AC_VO,
+       IEEE80211_AC_VO
+};
 
 static int wme_downgrade_ac(struct sk_buff *skb)
 {
@@ -50,26 +59,22 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
 {
        struct ieee80211_local *local = sdata->local;
        struct sta_info *sta = NULL;
-       u32 sta_flags = 0;
        const u8 *ra = NULL;
        bool qos = false;
 
        if (local->hw.queues < 4 || skb->len < 6) {
                skb->priority = 0; /* required for correct WPA/11i MIC */
-               return min_t(u16, local->hw.queues - 1,
-                            ieee802_1d_to_ac[skb->priority]);
+               return min_t(u16, local->hw.queues - 1, IEEE80211_AC_BE);
        }
 
        rcu_read_lock();
        switch (sdata->vif.type) {
        case NL80211_IFTYPE_AP_VLAN:
-               rcu_read_lock();
                sta = rcu_dereference(sdata->u.vlan.sta);
-               if (sta)
-                       sta_flags = get_sta_flags(sta);
-               rcu_read_unlock();
-               if (sta)
+               if (sta) {
+                       qos = get_sta_flags(sta) & WLAN_STA_WME;
                        break;
+               }
        case NL80211_IFTYPE_AP:
                ra = skb->data;
                break;
@@ -98,17 +103,13 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
        if (!sta && ra && !is_multicast_ether_addr(ra)) {
                sta = sta_info_get(sdata, ra);
                if (sta)
-                       sta_flags = get_sta_flags(sta);
+                       qos = get_sta_flags(sta) & WLAN_STA_WME;
        }
-
-       if (sta_flags & WLAN_STA_WME)
-               qos = true;
-
        rcu_read_unlock();
 
        if (!qos) {
                skb->priority = 0; /* required for correct WPA/11i MIC */
-               return ieee802_1d_to_ac[skb->priority];
+               return IEEE80211_AC_BE;
        }
 
        /* use the data classifier to determine what 802.1d tag the