drop duplicate 6.11 patch

diff --git a/queue-6.11/net-stmmac-dwmac-socfpga-set-rx-watchdog-interrupt-a.patch-14081 b/queue-6.11/net-stmmac-dwmac-socfpga-set-rx-watchdog-interrupt-a.patch-14081
deleted file mode 100644 (file)
index d2b8c3f..0000000
--- a/queue-6.11/net-stmmac-dwmac-socfpga-set-rx-watchdog-interrupt-a.patch-14081
+++ /dev/null
@@ -1,50 +0,0 @@
-From 229d0b38c0596b482f507fd460206f42f981747b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 22 Nov 2024 15:12:55 +0100
-Subject: net: stmmac: dwmac-socfpga: Set RX watchdog interrupt as broken
-
-From: Maxime Chevallier <maxime.chevallier@bootlin.com>
-
-[ Upstream commit 407618d66dba55e7db1278872e8be106808bbe91 ]
-
-On DWMAC3 and later, there's a RX Watchdog interrupt that's used for
-interrupt coalescing. It's known to be buggy on some platforms, and
-dwmac-socfpga appears to be one of them. Changing the interrupt
-coalescing from ethtool doesn't appear to have any effect here.
-
-Without disabling RIWT (Received Interrupt Watchdog Timer, I
-believe...), we observe latencies while receiving traffic that amount to
-around ~0.4ms. This was discovered with NTP but can be easily reproduced
-with a simple ping. Without this patch :
-
-64 bytes from 192.168.5.2: icmp_seq=1 ttl=64 time=0.657 ms
-
-With this patch :
-
-64 bytes from 192.168.5.2: icmp_seq=1 ttl=64 time=0.254 ms
-
-Fixes: 801d233b7302 ("net: stmmac: Add SOCFPGA glue driver")
-Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
-Link: https://patch.msgid.link/20241122141256.764578-1-maxime.chevallier@bootlin.com
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
-index e897b49aa9e05..98d40200d76ef 100644
---- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
-@@ -488,6 +488,8 @@ static int socfpga_dwmac_probe(struct platform_device *pdev)
- 
-       plat_dat->riwt_off = 1;
- 
-+      plat_dat->riwt_off = 1;
-+
-       ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
-       if (ret)
-               return ret;
--- 
-2.43.0
-

diff --git a/queue-6.11/series b/queue-6.11/series
index 82202bd32a49a2e33ea386870a1f4f12c6f0a36e..c73017275a8bd77f366eae006dc515d622e76f25 100644 (file)
--- a/queue-6.11/series
+++ b/queue-6.11/series
@@ -594,7 +594,6 @@ rxrpc-improve-setsockopt-handling-of-malformed-user-.patch
 tcp-fix-use-after-free-of-nreq-in-reqsk_timer_handle.patch
 ip6mr-fix-tables-suspicious-rcu-usage.patch
 ipmr-fix-tables-suspicious-rcu-usage.patch
-net-stmmac-dwmac-socfpga-set-rx-watchdog-interrupt-a.patch-14081
 iio-light-al3010-fix-an-error-handling-path-in-al301.patch
 usb-using-mutex-lock-and-supporting-o_nonblock-flag-.patch
 usb-yurex-make-waiting-on-yurex_write-interruptible.patch