ath10k: set max_num_pending_tx in ath10k_core_init_firmware_features()

Better to have this in same place as other firmware interface handling.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 16f210e0b8334284723d9ef4e50ee2975edb2b94..54a1257f85351fc181a15d8ff8c664862de798ca 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -906,11 +906,13 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar)
        case ATH10K_FW_WMI_OP_VERSION_MAIN:
                ar->max_num_peers = TARGET_NUM_PEERS;
                ar->max_num_stations = TARGET_NUM_STATIONS;
+               ar->htt.max_num_pending_tx = TARGET_NUM_MSDU_DESC;
                break;
        case ATH10K_FW_WMI_OP_VERSION_10_1:
        case ATH10K_FW_WMI_OP_VERSION_10_2:
                ar->max_num_peers = TARGET_10X_NUM_PEERS;
                ar->max_num_stations = TARGET_10X_NUM_STATIONS;
+               ar->htt.max_num_pending_tx = TARGET_10X_NUM_MSDU_DESC;
                break;
        case ATH10K_FW_WMI_OP_VERSION_UNSET:
        case ATH10K_FW_WMI_OP_VERSION_MAX:

diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 4bc51d8a14a3aed706429f769c33f56226ee366d..a1bda41fb543ecde1a72c2f379ca88e61bd971bf 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -93,11 +93,6 @@ int ath10k_htt_tx_alloc(struct ath10k_htt *htt)
 
        spin_lock_init(&htt->tx_lock);
 
-       if (test_bit(ATH10K_FW_FEATURE_WMI_10X, htt->ar->fw_features))
-               htt->max_num_pending_tx = TARGET_10X_NUM_MSDU_DESC;
-       else
-               htt->max_num_pending_tx = TARGET_NUM_MSDU_DESC;
-
        ath10k_dbg(ar, ATH10K_DBG_BOOT, "htt tx max num pending tx %d\n",
                   htt->max_num_pending_tx);