mac80211: QoS related cleanups

[mirror_ubuntu-hirsute-kernel.git] / net / mac80211 / mlme.c

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index e860d0bacea9bbdee08a5baabe3aab10b47e2004..55b85ae5bc11e85909f185f76229950fc4b861d2 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -257,19 +257,8 @@ static void ieee80211_sta_def_wmm_params(struct net_device *dev,
                qparam.cw_max = 1023;
                qparam.txop = 0;
 
-               for (i = IEEE80211_TX_QUEUE_DATA0; i < NUM_TX_DATA_QUEUES; i++)
-                       local->ops->conf_tx(local_to_hw(local),
-                                          i + IEEE80211_TX_QUEUE_DATA0,
-                                          &qparam);
-
-               if (ibss) {
-                       /* IBSS uses different parameters for Beacon sending */
-                       qparam.cw_min++;
-                       qparam.cw_min *= 2;
-                       qparam.cw_min--;
-                       local->ops->conf_tx(local_to_hw(local),
-                                          IEEE80211_TX_QUEUE_BEACON, &qparam);
-               }
+               for (i = 0; i < local_to_hw(local)->queues; i++)
+                       local->ops->conf_tx(local_to_hw(local), i, &qparam);
        }
 }
 
@@ -306,23 +295,23 @@ static void ieee80211_sta_wmm_params(struct net_device *dev,
 
                switch (aci) {
                case 1:
-                       queue = IEEE80211_TX_QUEUE_DATA3;
+                       queue = 3;
                        if (acm)
                                local->wmm_acm |= BIT(0) | BIT(3);
                        break;
                case 2:
-                       queue = IEEE80211_TX_QUEUE_DATA1;
+                       queue = 1;
                        if (acm)
                                local->wmm_acm |= BIT(4) | BIT(5);
                        break;
                case 3:
-                       queue = IEEE80211_TX_QUEUE_DATA0;
+                       queue = 0;
                        if (acm)
                                local->wmm_acm |= BIT(6) | BIT(7);
                        break;
                case 0:
                default:
-                       queue = IEEE80211_TX_QUEUE_DATA2;
+                       queue = 2;
                        if (acm)
                                local->wmm_acm |= BIT(1) | BIT(2);
                        break;