net: ethernet: mtk_wed: rename mtk_rxbm_desc in mtk_wed_bm_desc

Rename mtk_rxbm_desc structure in mtk_wed_bm_desc since it will be used
even on tx side by MT7988 SoC.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/mediatek/mtk_wed.c b/drivers/net/ethernet/mediatek/mtk_wed.c
index 750326b298dcc9a22f762f33e5a63b42c4d27ed0..f166d4f0b7935f5873d1b65ed6b50cb515b5094e 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
@@ -422,7 +422,7 @@ free_pagelist:
 static int
 mtk_wed_rx_buffer_alloc(struct mtk_wed_device *dev)
 {
-       struct mtk_rxbm_desc *desc;
+       struct mtk_wed_bm_desc *desc;
        dma_addr_t desc_phys;
 
        dev->rx_buf_ring.size = dev->wlan.rx_nbuf;
@@ -442,7 +442,7 @@ mtk_wed_rx_buffer_alloc(struct mtk_wed_device *dev)
 static void
 mtk_wed_free_rx_buffer(struct mtk_wed_device *dev)
 {
-       struct mtk_rxbm_desc *desc = dev->rx_buf_ring.desc;
+       struct mtk_wed_bm_desc *desc = dev->rx_buf_ring.desc;
 
        if (!desc)
                return;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
index fc7ace638ce8e9f78747a26d4ed87ef66ff022e7..e7d8e03f826f89b4442d306be8b8ca898eeaf188 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
@@ -591,7 +591,7 @@ static void mt7915_mmio_wed_release_rx_buf(struct mtk_wed_device *wed)
 
 static u32 mt7915_mmio_wed_init_rx_buf(struct mtk_wed_device *wed, int size)
 {
-       struct mtk_rxbm_desc *desc = wed->rx_buf_ring.desc;
+       struct mtk_wed_bm_desc *desc = wed->rx_buf_ring.desc;
        struct mt76_txwi_cache *t = NULL;
        struct mt7915_dev *dev;
        struct mt76_queue *q;

diff --git a/include/linux/soc/mediatek/mtk_wed.h b/include/linux/soc/mediatek/mtk_wed.h
index b2b28180dff71014ee267b830fed0f96087ec65f..c6512c216b279454b53f344485159ccc57e27363 100644 (file)
--- a/include/linux/soc/mediatek/mtk_wed.h
+++ b/include/linux/soc/mediatek/mtk_wed.h
@@ -45,7 +45,7 @@ enum mtk_wed_wo_cmd {
        MTK_WED_WO_CMD_WED_END
 };
 
-struct mtk_rxbm_desc {
+struct mtk_wed_bm_desc {
        __le32 buf0;
        __le32 token;
 } __packed __aligned(4);
@@ -104,7 +104,7 @@ struct mtk_wed_device {
 
        struct {
                int size;
-               struct mtk_rxbm_desc *desc;
+               struct mtk_wed_bm_desc *desc;
                dma_addr_t desc_phys;
        } rx_buf_ring;