298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

mt76: fix build errors with upsteam version

Browse Source
This commit is contained in:
coolsnowwolf 2023-02-18 20:52:42 +08:00
parent 45b15e953c
commit 7032f6d8b9
3 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
package/kernel/mt76/patches/030-01-net-ethernet-mtk_wed-add-reset-to-rx_ring_setup-callback.patch Normal file
View File

@ -0,0 +1,31 @@
From 0cf0ede7cc42a3810a960082aa235ef159cb8d7b Mon Sep 17 00:00:00 2001
From: Lorenzo Bianconi <lorenzo@kernel.org>
Date: Mon, 5 Dec 2022 12:34:42 +0100
Subject: [PATCH] net: ethernet: mtk_wed: add reset to rx_ring_setup callback
This patch adds reset parameter to mtk_wed_rx_ring_setup signature
in order to align rx_ring_setup callback to tx_ring_setup one introduced
in 'commit 23dca7a90017 ("net: ethernet: mtk_wed: add reset to
tx_ring_setup callback")'
Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/29c6e7a5469e784406cf3e2920351d1207713d05.1670239984.git.lorenzo@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/dma.c
+++ b/dma.c
@@ -663,7 +663,7 @@ mt76_dma_wed_setup(struct mt76_dev *dev,
q->wed_regs = wed->txfree_ring.reg_base;
break;
case MT76_WED_Q_RX:
- ret = mtk_wed_device_rx_ring_setup(wed, ring, q->regs);
+ ret = mtk_wed_device_rx_ring_setup(wed, ring, q->regs, false);
if (!ret)
q->wed_regs = wed->rx_ring[ring].reg_base;
break;

28
package/kernel/mt76/patches/030-02-net-ethernet-mtk_wed-add-reset-to-tx_ring_setup-callback.patch Normal file
View File

@ -0,0 +1,28 @@
From 715b3ed9708a70e73888faa5bf24afd84f965dff Mon Sep 17 00:00:00 2001
From: Lorenzo Bianconi <lorenzo@kernel.org>
Date: Thu, 24 Nov 2022 16:22:55 +0100
Subject: [PATCH] net: ethernet: mtk_wed: add reset to tx_ring_setup callback
Introduce reset parameter to mtk_wed_tx_ring_setup signature.
This is a preliminary patch to add Wireless Ethernet Dispatcher reset
support.
Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/dma.c
+++ b/dma.c
@@ -647,7 +647,7 @@ mt76_dma_wed_setup(struct mt76_dev *dev,
switch (type) {
case MT76_WED_Q_TX:
- ret = mtk_wed_device_tx_ring_setup(wed, ring, q->regs);
+ ret = mtk_wed_device_tx_ring_setup(wed, ring, q->regs, false);
if (!ret)
q->wed_regs = wed->tx_ring[ring].reg_base;
break;

3
package/kernel/mt76/patches/091-fix-linux-6.1-build.patch
View File

@ -40,7 +40,6 @@
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
+#define netif_tx_napi_add netif_napi_add_tx_weight +#define netif_tx_napi_add netif_napi_add_tx_weight
+#endif +#endif
struct mt76_dev; struct mt76_dev;
struct mt76_phy; struct mt76_phy;