ath10k: keep track of queue depth per txq

This will be necessary for later.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 89f789f3e5b4c0fd95f7b22a55dffd6035939bcf..926ecb2244a59d11bf90a98e214954f63faf267e 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -311,6 +311,7 @@ struct ath10k_peer {
 
 struct ath10k_txq {
        struct list_head list;
+       unsigned long num_fw_queued;
 };
 
 struct ath10k_sta {

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 8d02d53fdc2caa596b9e84279cda21e8c8afd85c..5bf614f1f75aebc8dec0b89dd5773577ad60a62a 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3669,6 +3669,7 @@ static int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,
        const bool is_presp = false;
        struct ath10k *ar = hw->priv;
        struct ath10k_htt *htt = &ar->htt;
+       struct ath10k_txq *artxq = (void *)txq->drv_priv;
        struct ieee80211_vif *vif = txq->vif;
        struct ieee80211_sta *sta = txq->sta;
        enum ath10k_hw_txrx_mode txmode;
@@ -3708,6 +3709,10 @@ static int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,
                return ret;
        }
 
+       spin_lock_bh(&ar->htt.tx_lock);
+       artxq->num_fw_queued++;
+       spin_unlock_bh(&ar->htt.tx_lock);
+
        return 0;
 }
 

diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c
index 202e5192235b74018cf1a0762a5c7012f9cb4c17..ea4d3000c8c397a53182418ba9da06f494b7492d 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/txrx.c
+++ b/drivers/net/wireless/ath/ath10k/txrx.c
@@ -55,7 +55,9 @@ void ath10k_txrx_tx_unref(struct ath10k_htt *htt,
        struct ath10k *ar = htt->ar;
        struct device *dev = ar->dev;
        struct ieee80211_tx_info *info;
+       struct ieee80211_txq *txq;
        struct ath10k_skb_cb *skb_cb;
+       struct ath10k_txq *artxq;
        struct sk_buff *msdu;
        bool limit_mgmt_desc = false;
 
@@ -80,11 +82,16 @@ void ath10k_txrx_tx_unref(struct ath10k_htt *htt,
        }
 
        skb_cb = ATH10K_SKB_CB(msdu);
+       txq = skb_cb->txq;
+       artxq = (void *)txq->drv_priv;
 
        if (unlikely(skb_cb->flags & ATH10K_SKB_F_MGMT) &&
            ar->hw_params.max_probe_resp_desc_thres)
                limit_mgmt_desc = true;
 
+       if (txq)
+               artxq->num_fw_queued--;
+
        ath10k_htt_tx_free_msdu_id(htt, tx_done->msdu_id);
        ath10k_htt_tx_dec_pending(htt, limit_mgmt_desc);
        if (htt->num_pending_tx == 0)