Reorder and update existing patches Signed-off-by: Felix Fietkau <nbd@nbd.name> (cherry picked from commit 6407ef8d2bcb4a0a6284de09cd77bd1868c1d6ea) [rmilecki: rebase & fix mt76 compilation] Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
25 lines
825 B
Diff
25 lines
825 B
Diff
From 9c7b98c03173a1a201d74203a81b344a0cd637ac Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Mon, 18 Sep 2023 12:29:07 +0200
|
|
Subject: [PATCH] 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>
|
|
---
|
|
|
|
--- a/mt7915/mmio.c
|
|
+++ b/mt7915/mmio.c
|
|
@@ -591,7 +591,7 @@ static void mt7915_mmio_wed_release_rx_b
|
|
|
|
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;
|