wifi: mt76: remove unused error path in mt76_connac_tx_complete_skb

[ Upstream commit 832f42699791e7a90e81c15da0ce886b4f8300b8 ]

The error handling code was added in order to allow tx enqueue to fail after
calling .tx_prepare_skb. Since this can no longer happen, the error handling
code is unused.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Stable-dep-of: bde2e77f7626 ("wifi: mt76: mt7996: set correct wcid in txp")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
index dc8f4e1..6ca7b49 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -330,9 +330,6 @@ mt76_dma_tx_cleanup_idx(struct mt76_dev *dev, struct mt76_queue *q, int idx,
        if (e->txwi == DMA_DUMMY_DATA)
                e->txwi = NULL;
 
-       if (e->skb == DMA_DUMMY_DATA)
-               e->skb = NULL;
-
        *prev_e = *e;
        memset(e, 0, sizeof(*e));
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
index 0019890..fbb1181 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
@@ -106,7 +106,7 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
        else
                mt76_connac_write_hw_txp(mdev, tx_info, txp, id);
 
-       tx_info->skb = DMA_DUMMY_DATA;
+       tx_info->skb = NULL;
 
        return 0;
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
index ee5177f..73db9e1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
@@ -151,23 +151,6 @@ void mt76_connac_tx_complete_skb(struct mt76_dev *mdev,
                return;
        }
 
-       /* error path */
-       if (e->skb == DMA_DUMMY_DATA) {
-               struct mt76_connac_txp_common *txp;
-               struct mt76_txwi_cache *t;
-               u16 token;
-
-               txp = mt76_connac_txwi_to_txp(mdev, e->txwi);
-               if (is_mt76_fw_txp(mdev))
-                       token = le16_to_cpu(txp->fw.token);
-               else
-                       token = le16_to_cpu(txp->hw.msdu_id[0]) &
-                               ~MT_MSDU_ID_VALID;
-
-               t = mt76_token_put(mdev, token);
-               e->skb = t ? t->skb : NULL;
-       }
-
        if (e->skb)
                mt76_tx_complete_skb(mdev, e->wcid, e->skb);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index b8b0c0f..2222fb9 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -809,7 +809,7 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
                txp->rept_wds_wcid = cpu_to_le16(wcid->idx);
        else
                txp->rept_wds_wcid = cpu_to_le16(0x3ff);
-       tx_info->skb = DMA_DUMMY_DATA;
+       tx_info->skb = NULL;
 
        /* pass partial skb header to fw */
        tx_info->buf[1].len = MT_CT_PARSE_LEN;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c
index e7a995e..c866144 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c
@@ -48,7 +48,7 @@ int mt7921e_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
        memset(txp, 0, sizeof(struct mt76_connac_hw_txp));
        mt76_connac_write_hw_txp(mdev, tx_info, txp, id);
 
-       tx_info->skb = DMA_DUMMY_DATA;
+       tx_info->skb = NULL;
 
        return 0;
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index ac8759f..0eebf91 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -995,7 +995,7 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
                txp->fw.rept_wds_wcid = cpu_to_le16(wcid->idx);
        else
                txp->fw.rept_wds_wcid = cpu_to_le16(0xfff);
-       tx_info->skb = DMA_DUMMY_DATA;
+       tx_info->skb = NULL;
 
        /* pass partial skb header to fw */
        tx_info->buf[1].len = MT_CT_PARSE_LEN;