drop queue-5.15/net-ethernet-mtk-star-emac-disable-napi-when-connect.patch

diff --git a/queue-5.15/net-ethernet-mtk-star-emac-disable-napi-when-connect.patch b/queue-5.15/net-ethernet-mtk-star-emac-disable-napi-when-connect.patch
deleted file mode 100644 (file)
index 1d554c8..0000000
--- a/queue-5.15/net-ethernet-mtk-star-emac-disable-napi-when-connect.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4eda0469f28fec6fd5302675468306926bee501f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 7 Nov 2022 09:21:59 +0800
-Subject: net: ethernet: mtk-star-emac: disable napi when connect and start PHY
- failed in mtk_star_enable()
-
-From: Zhengchao Shao <shaozhengchao@huawei.com>
-
-[ Upstream commit b0c09c7f08c2467b2089bdf4adb2fbbc2464f4a8 ]
-
-When failed to connect to and start PHY in mtk_star_enable() for opening
-device, napi isn't disabled. When open mtk star device next time, it will
-reports a invalid opcode issue. Fix it. Only be compiled, not be tested.
-
-Fixes: 8c7bd5a454ff ("net: ethernet: mtk-star-emac: new driver")
-Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
-Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
-Link: https://lore.kernel.org/r/20221107012159.211387-1-shaozhengchao@huawei.com
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/net/ethernet/mediatek/mtk_star_emac.c b/drivers/net/ethernet/mediatek/mtk_star_emac.c
-index 1d5dd2015453..b3c4849f9f39 100644
---- a/drivers/net/ethernet/mediatek/mtk_star_emac.c
-+++ b/drivers/net/ethernet/mediatek/mtk_star_emac.c
-@@ -977,6 +977,8 @@ static int mtk_star_enable(struct net_device *ndev)
-       return 0;
- 
- err_free_irq:
-+      napi_disable(&priv->rx_napi);
-+      napi_disable(&priv->tx_napi);
-       free_irq(ndev->irq, ndev);
- err_free_skbs:
-       mtk_star_free_rx_skbs(priv);
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 61664334348bb2f75cadb90cf5a016ab1a058e9c..86907c760ab6acfdad544722bc2a2c685cb67d9c 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -49,7 +49,6 @@ dmaengine-pxa_dma-use-platform_get_irq_optional.patch
 dmaengine-mv_xor_v2-fix-a-resource-leak-in-mv_xor_v2.patch
 dmaengine-ti-k3-udma-glue-fix-memory-leak-when-regis.patch
 net-lapbether-fix-issue-of-invalid-opcode-in-lapbeth.patch
-net-ethernet-mtk-star-emac-disable-napi-when-connect.patch
 drivers-net-xgene-disable-napi-when-register-irq-fai.patch
 perf-stat-fix-printing-os-prefix-in-csv-metrics-outp.patch
 perf-tools-add-the-include-perf-directory-to-.gitign.patch