aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c23
1 files changed, 6 insertions, 17 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index e860d0bacea9..55b85ae5bc11 100644
--- 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,
257 qparam.cw_max = 1023; 257 qparam.cw_max = 1023;
258 qparam.txop = 0; 258 qparam.txop = 0;
259 259
260 for (i = IEEE80211_TX_QUEUE_DATA0; i < NUM_TX_DATA_QUEUES; i++) 260 for (i = 0; i < local_to_hw(local)->queues; i++)
261 local->ops->conf_tx(local_to_hw(local), 261 local->ops->conf_tx(local_to_hw(local), i, &qparam);
262 i + IEEE80211_TX_QUEUE_DATA0,
263 &qparam);
264
265 if (ibss) {
266 /* IBSS uses different parameters for Beacon sending */
267 qparam.cw_min++;
268 qparam.cw_min *= 2;
269 qparam.cw_min--;
270 local->ops->conf_tx(local_to_hw(local),
271 IEEE80211_TX_QUEUE_BEACON, &qparam);
272 }
273 } 262 }
274} 263}
275 264
@@ -306,23 +295,23 @@ static void ieee80211_sta_wmm_params(struct net_device *dev,
306 295
307 switch (aci) { 296 switch (aci) {
308 case 1: 297 case 1:
309 queue = IEEE80211_TX_QUEUE_DATA3; 298 queue = 3;
310 if (acm) 299 if (acm)
311 local->wmm_acm |= BIT(0) | BIT(3); 300 local->wmm_acm |= BIT(0) | BIT(3);
312 break; 301 break;
313 case 2: 302 case 2:
314 queue = IEEE80211_TX_QUEUE_DATA1; 303 queue = 1;
315 if (acm) 304 if (acm)
316 local->wmm_acm |= BIT(4) | BIT(5); 305 local->wmm_acm |= BIT(4) | BIT(5);
317 break; 306 break;
318 case 3: 307 case 3:
319 queue = IEEE80211_TX_QUEUE_DATA0; 308 queue = 0;
320 if (acm) 309 if (acm)
321 local->wmm_acm |= BIT(6) | BIT(7); 310 local->wmm_acm |= BIT(6) | BIT(7);
322 break; 311 break;
323 case 0: 312 case 0:
324 default: 313 default:
325 queue = IEEE80211_TX_QUEUE_DATA2; 314 queue = 2;
326 if (acm) 315 if (acm)
327 local->wmm_acm |= BIT(1) | BIT(2); 316 local->wmm_acm |= BIT(1) | BIT(2);
328 break; 317 break;