be3ce63822
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.36 Remove upstream patches: generic/backport-6.12/780-09-v6.13-r8169-add-support-for-RTL8125D.patch[1] generic/backport-6.12/781-04-v6.13-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch[2] generic/backport-6.12/781-05-v6.13-net-phy-realtek-add-RTL8125D-internal-PHY.patch[3] All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.36&id=37cb5967bd2513416398ff1a87a5ee2e63270b00 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.36&id=5eb0b10eea271e2e1f7d4fa1a6af6c09b2ecc4f5 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.36&id=5d479182d4ccde76df830a72927b3bdaafd142bf Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Tested-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/19317 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
33 lines
1.3 KiB
Diff
33 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
|
|
@@ -4813,11 +4813,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);
|
|
}
|
|
|