mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-05-20 21:27:55 +00:00
Upstream e2015942e90a couldn't be backported to 6.6 because the following symbols were missing: - disable_work - disable_work_sync - enable_work Seee2015942e9
Upstream 34e5ededf4b8 couldn't be backported to 6.6 because the following symbol was missing: - pcim_iomap_region See34e5ededf4
Reorganize patch numbers now that < 6.12 patches are no longer needed. The following patches still differ from upstream: - e340bff27e63 phy_set_eee_broken symbol is missing in 6.12 https://github.com/torvalds/linux/commit/e340bff27e63 The following patches can't be backported to 6.12 due to missing symbols: - 5e7a74b6a357 phy_disable_eee_mode symbol is missing in 6.12 https://github.com/torvalds/linux/commit/5e7a74b6a357 Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 854d71c555dfc3383c1fde7d9989b6046e21093d Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Wed, 9 Oct 2024 07:48:05 +0200
|
|
Subject: [PATCH] r8169: remove original workaround for RTL8125 broken rx issue
|
|
|
|
Now that we have b9c7ac4fe22c ("r8169: disable ALDPS per default for
|
|
RTL8125"), the first attempt to fix the issue shouldn't be needed
|
|
any longer. So let's effectively revert 621735f59064 ("r8169: fix
|
|
rare issue with broken rx after link-down on RTL8125") and see
|
|
whether anybody complains.
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/382d8c88-cbce-400f-ad62-fda0181c7e38@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169_main.c | 4 ----
|
|
1 file changed, 4 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -4777,11 +4777,7 @@ static void r8169_phylink_handler(struct
|
|
if (netif_carrier_ok(ndev)) {
|
|
rtl_link_chg_patch(tp);
|
|
pm_request_resume(d);
|
|
- netif_wake_queue(tp->dev);
|
|
} else {
|
|
- /* In few cases rx is broken after link-down otherwise */
|
|
- if (rtl_is_8125(tp))
|
|
- rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_NO_QUEUE_WAKE);
|
|
pm_runtime_idle(d);
|
|
}
|
|
|