| Message ID | 382d8c88-cbce-400f-ad62-fda0181c7e38@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 854d71c555dfc3383c1fde7d9989b6046e21093d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] r8169: remove original workaround for RTL8125 broken rx issue | expand |
On Wed, Oct 09, 2024 at 07:48:05AM +0200, Heiner Kallweit wrote: > 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>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 9 Oct 2024 07:48:05 +0200 you wrote: > 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> > > [...] Here is the summary with links: - [net-next] r8169: remove original workaround for RTL8125 broken rx issue https://git.kernel.org/netdev/net-next/c/854d71c555df You are awesome, thank you!
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index f8782e63e..31e8634a6 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4741,11 +4741,7 @@ static void r8169_phylink_handler(struct net_device *ndev) 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); }
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> --- drivers/net/ethernet/realtek/r8169_main.c | 4 ---- 1 file changed, 4 deletions(-)