wifi: mt76: mt7996: rely on mt76_connac_tx_complete_skb

Drop mt7996_tx_complete_skb routine since it is equivalent to
mt76_connac_tx_complete_skb().

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index eaf877c811abc07a27e2bfa31ef32d860dd91c72..44b4a2469ae1cd57e2e0e0740e571228b9fb81d8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -1533,27 +1533,6 @@ void mt7996_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
        }
 }
 
-void mt7996_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e)
-{
-       if (!e->txwi) {
-               dev_kfree_skb_any(e->skb);
-               return;
-       }
-
-       /* error path */
-       if (e->skb == DMA_DUMMY_DATA) {
-               struct mt76_connac_txp_common *txp;
-               struct mt76_txwi_cache *t;
-
-               txp = mt7996_txwi_to_txp(mdev, e->txwi);
-               t = mt76_token_put(mdev, le16_to_cpu(txp->fw.token));
-               e->skb = t ? t->skb : NULL;
-       }
-
-       if (e->skb)
-               mt76_tx_complete_skb(mdev, e->wcid, e->skb);
-}
-
 void mt7996_mac_cca_stats_reset(struct mt7996_phy *phy)
 {
        struct mt7996_dev *dev = phy->dev;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.h b/drivers/net/wireless/mediatek/mt76/mt7996/mac.h
index 10e08d66d474244294f31bd8d933146b4d468664..27184cbac619b58f056cfa565622ccbc1fb53cb9 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.h
@@ -371,17 +371,4 @@ struct mt7996_dfs_radar_spec {
        struct mt7996_dfs_pattern radar_pattern[16];
 };
 
-static inline struct mt76_connac_txp_common *
-mt7996_txwi_to_txp(struct mt76_dev *dev, struct mt76_txwi_cache *t)
-{
-       u8 *txwi;
-
-       if (!t)
-               return NULL;
-
-       txwi = mt76_get_txwi_ptr(dev, t);
-
-       return (struct mt76_connac_txp_common *)(txwi + MT_TXD_SIZE);
-}
-
 #endif

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
index 2237f50adbc71e4aa8fcc87b24120b689662e860..902370a2a6397220ec6482fcb139539796353736 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
@@ -326,7 +326,7 @@ struct mt7996_dev *mt7996_mmio_probe(struct device *pdev,
                                SURVEY_INFO_TIME_BSS_RX,
                .token_size = MT7996_TOKEN_SIZE,
                .tx_prepare_skb = mt7996_tx_prepare_skb,
-               .tx_complete_skb = mt7996_tx_complete_skb,
+               .tx_complete_skb = mt76_connac_tx_complete_skb,
                .rx_skb = mt7996_queue_rx_skb,
                .rx_check = mt7996_rx_check,
                .rx_poll_complete = mt7996_rx_poll_complete,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index 725344791b4cdeebc5c2bddf938e5039732c42d4..9c6823284834cea0d189b442b6ca37cb89228252 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -493,7 +493,6 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
                          enum mt76_txq_id qid, struct mt76_wcid *wcid,
                          struct ieee80211_sta *sta,
                          struct mt76_tx_info *tx_info);
-void mt7996_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);
 void mt7996_tx_token_put(struct mt7996_dev *dev);
 void mt7996_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
                         struct sk_buff *skb, u32 *info);