mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
7a1815f64d
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.59
Removed upstreamed:
- generic/backport-6.6/777-netfilter-xtables-fix-typo-causing-some-targets-to-not-load-on-IPv6.patch[1]
- generic/backport-6.6/780-24-v6.12-r8169-avoid-unsolicited-interrupts.patch[2]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.59&id=433742ba96baf30c21e654ce3e698ad87100593b
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.59&id=7d6d46b429804b1a182106e27e2f8c0e84689e1a
Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/16835
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 4fc47c6000)
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From 6994520a332887f1688464f250c9ec8002a89a8e Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Mon, 27 May 2024 21:16:56 +0200
|
|
Subject: [PATCH] r8169: disable interrupt source RxOverflow
|
|
|
|
Vendor driver calls this bit RxDescUnavail. All we do in the interrupt
|
|
handler in this case is scheduling NAPI. If we should be out of
|
|
RX descriptors, then NAPI is scheduled anyway. Therefore remove this
|
|
interrupt source. Tested on RTL8168h.
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Reviewed-by: Sunil Goutham <sgoutham@marvell.com>
|
|
Link: https://lore.kernel.org/r/9b2054b2-0548-4f48-bf91-b646572093b4@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169_main.c | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -5112,12 +5112,10 @@ static void rtl_set_irq_mask(struct rtl8
|
|
tp->irq_mask = RxOK | RxErr | TxOK | TxErr | LinkChg;
|
|
|
|
if (tp->mac_version <= RTL_GIGA_MAC_VER_06)
|
|
- tp->irq_mask |= SYSErr | RxOverflow | RxFIFOOver;
|
|
+ tp->irq_mask |= SYSErr | RxFIFOOver;
|
|
else if (tp->mac_version == RTL_GIGA_MAC_VER_11)
|
|
/* special workaround needed */
|
|
tp->irq_mask |= RxFIFOOver;
|
|
- else
|
|
- tp->irq_mask |= RxOverflow;
|
|
}
|
|
|
|
static int rtl_alloc_irq(struct rtl8169_private *tp)
|