Drop wifi-mt76-disable-napi-when-removing-device.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.18/series b/queue-6.18/series
index cc382a6b6f137ba94c38540a32bd307a052d3d61..37e96a8159486c855926ecb991d22b62d974b76e 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -258,7 +258,6 @@ tipc-fix-infinite-loop-in-__tipc_nl_compat_dumpit.patch
 ppp-enable-tx-scatter-gather.patch
 ppp-don-t-store-tx-skb-in-the-fastpath.patch
 ppp-annotate-concurrent-dev-stats-accesses.patch
-wifi-mt76-disable-napi-when-removing-device.patch
 wifi-mt76-mt7925-guard-link-sta-in-decap-offload.patch
 wifi-mt76-mt7915-guard-he-capability-lookups.patch
 wifi-mt76-connac-fix-possible-null-pointer-deref-in-.patch

diff --git a/queue-6.18/wifi-mt76-disable-napi-when-removing-device.patch b/queue-6.18/wifi-mt76-disable-napi-when-removing-device.patch
deleted file mode 100644 (file)
index 225d4c1..0000000
--- a/queue-6.18/wifi-mt76-disable-napi-when-removing-device.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ec85c41196070fef11374b2a774ece87083c8a84 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 8 Jul 2026 16:43:47 +0200
-Subject: wifi: mt76: Disable napi when removing device
-
-From: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
-
-[ Upstream commit 13b7e6a96a005c656d38f3da51581deaf9866375 ]
-
-Unloading the mt7915e module with a MT7916 triggers multiples WARN in
-__netif_napi_del_locked() and in page_pool_disable_direct_recycling()
-because the driver does not disable the napi before destroying it.
-
-This is troublesome since on MT7916 it is required to unload the module
-and reinsert it with a different enable_6ghz parameter to change the
-frequency.  The system generally becomes unstable after reinserting the
-module.
-
-Fix it by disabling napi before deleting it.  Also, do not delete napi
-on WED queues since napi is neither used nor initialized on them.
-
-Fixes: 17f1de56df05 ("mt76: add common code shared between multiple chipsets")
-Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
-Link: https://patch.msgid.link/20260708144615.24092-1-nicolas.cavallari@green-communications.fr
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/mediatek/mt76/dma.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
-index 9ef073c27f3096..f5b2c8996affd1 100644
---- a/drivers/net/wireless/mediatek/mt76/dma.c
-+++ b/drivers/net/wireless/mediatek/mt76/dma.c
-@@ -1174,7 +1174,10 @@ void mt76_dma_cleanup(struct mt76_dev *dev)
-       mt76_for_each_q_rx(dev, i) {
-               struct mt76_queue *q = &dev->q_rx[i];
- 
--              netif_napi_del(&dev->napi[i]);
-+              if (!mt76_queue_is_wed_rro(q)) {
-+                      napi_disable(&dev->napi[i]);
-+                      netif_napi_del(&dev->napi[i]);
-+              }
-               mt76_dma_rx_cleanup(dev, q);
- 
-               page_pool_destroy(q->page_pool);
--- 
-2.53.0
-

diff --git a/queue-7.1/series b/queue-7.1/series
index 5be8425ffc81ed2577dc91ef482b13e4d789d799..23adf833805e0a6c80407db45e6b06da25df97ed 100644 (file)
--- a/queue-7.1/series
+++ b/queue-7.1/series
@@ -286,7 +286,6 @@ tipc-fix-infinite-loop-in-__tipc_nl_compat_dumpit.patch
 cifs-prevent-readdir-from-changing-file-size-due-to-.patch
 cifs-fix-cifsfileinfo-leak-on-kmalloc-failure-in-def.patch
 ppp-annotate-concurrent-dev-stats-accesses.patch
-wifi-mt76-disable-napi-when-removing-device.patch
 wifi-mt76-mt7925-guard-link-sta-in-decap-offload.patch
 wifi-mt76-mt7915-guard-he-capability-lookups.patch
 wifi-mt76-connac-fix-possible-null-pointer-deref-in-.patch

diff --git a/queue-7.1/wifi-mt76-disable-napi-when-removing-device.patch b/queue-7.1/wifi-mt76-disable-napi-when-removing-device.patch
deleted file mode 100644 (file)
index 9a47885..0000000
--- a/queue-7.1/wifi-mt76-disable-napi-when-removing-device.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 675fc25cf465f29a15e1d2db2cbcfd2e011ef6c2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 8 Jul 2026 16:43:47 +0200
-Subject: wifi: mt76: Disable napi when removing device
-
-From: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
-
-[ Upstream commit 13b7e6a96a005c656d38f3da51581deaf9866375 ]
-
-Unloading the mt7915e module with a MT7916 triggers multiples WARN in
-__netif_napi_del_locked() and in page_pool_disable_direct_recycling()
-because the driver does not disable the napi before destroying it.
-
-This is troublesome since on MT7916 it is required to unload the module
-and reinsert it with a different enable_6ghz parameter to change the
-frequency.  The system generally becomes unstable after reinserting the
-module.
-
-Fix it by disabling napi before deleting it.  Also, do not delete napi
-on WED queues since napi is neither used nor initialized on them.
-
-Fixes: 17f1de56df05 ("mt76: add common code shared between multiple chipsets")
-Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
-Link: https://patch.msgid.link/20260708144615.24092-1-nicolas.cavallari@green-communications.fr
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/mediatek/mt76/dma.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
-index f8c2fe5f2f5877..32204185921746 100644
---- a/drivers/net/wireless/mediatek/mt76/dma.c
-+++ b/drivers/net/wireless/mediatek/mt76/dma.c
-@@ -1189,7 +1189,10 @@ void mt76_dma_cleanup(struct mt76_dev *dev)
-       mt76_for_each_q_rx(dev, i) {
-               struct mt76_queue *q = &dev->q_rx[i];
- 
--              netif_napi_del(&dev->napi[i]);
-+              if (!mt76_queue_is_wed_rro(q)) {
-+                      napi_disable(&dev->napi[i]);
-+                      netif_napi_del(&dev->napi[i]);
-+              }
-               mt76_dma_rx_cleanup(dev, q);
- 
-               page_pool_destroy(q->page_pool);
--- 
-2.53.0
-