hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/drivers/net/wireless/ath/carl9170/main.c
....@@ -1374,13 +1374,8 @@
13741374 int ret;
13751375
13761376 mutex_lock(&ar->mutex);
1377
- if (queue < ar->hw->queues) {
1378
- memcpy(&ar->edcf[ar9170_qmap[queue]], param, sizeof(*param));
1379
- ret = carl9170_set_qos(ar);
1380
- } else {
1381
- ret = -EINVAL;
1382
- }
1383
-
1377
+ memcpy(&ar->edcf[ar9170_qmap(queue)], param, sizeof(*param));
1378
+ ret = carl9170_set_qos(ar);
13841379 mutex_unlock(&ar->mutex);
13851380 return ret;
13861381 }
....@@ -1441,8 +1436,7 @@
14411436 rcu_assign_pointer(sta_info->agg[tid], tid_info);
14421437 spin_unlock_bh(&ar->tx_ampdu_list_lock);
14431438
1444
- ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
1445
- break;
1439
+ return IEEE80211_AMPDU_TX_START_IMMEDIATE;
14461440
14471441 case IEEE80211_AMPDU_TX_STOP_CONT:
14481442 case IEEE80211_AMPDU_TX_STOP_FLUSH:
....@@ -1922,7 +1916,7 @@
19221916 WARN_ON(!(tx_streams >= 1 && tx_streams <=
19231917 IEEE80211_HT_MCS_TX_MAX_STREAMS));
19241918
1925
- tx_params = (tx_streams - 1) <<
1919
+ tx_params |= (tx_streams - 1) <<
19261920 IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT;
19271921
19281922 carl9170_band_2GHz.ht_cap.mcs.tx_params |= tx_params;