Skip to contentSkip to conversation

r8169: remove not needed call to rtl_wol_enable_rx from rtl_shutdown

PATCH Applied Heiner Kallweit 2 participants 2 messages Jan 25, 2021 – Jan 28, 2021

Subsystems (3)
lore
Share & tools
lore

Heiner Kallweit

author maintainer
#0 lore raw

PATCH 1/1 r8169: remove not needed call to rtl_wol_enable_rx from rtl_shutdown

rtl_wol_enable_rx() is called via the following call chain if WoL is enabled:
rtl8169_down()
-> rtl_prepare_power_down()
-> rtl_wol_enable_rx()
Therefore we don't have to call this function here.

---
 drivers/net/ethernet/realtek/r8169_main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +1 -3
index fb67d8f79..475e6f01e 100644
@@ -4850,10 +4850,8 @@ static void rtl_shutdown(struct pci_dev *pdev)
 	rtl_rar_set(tp, tp->dev->perm_addr);
 
 	if (system_state == SYSTEM_POWER_OFF) {
-		if (tp->saved_wolopts) {
-			rtl_wol_enable_rx(tp);
+		if (tp->saved_wolopts)
 			rtl_wol_shutdown_quirk(tp);
-		}
 
 		pci_wake_from_d3(pdev, tp->saved_wolopts);
 		pci_set_power_state(pdev, PCI_D3hot);
Signature · 1 line
2.30.0
#1 lore raw
This patch was applied to netdev/net-next.git (refs/heads/master):

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

Quoted 8 lines · On Mon, 25 Jan 2021 17:55:12 +0100 you wrote:

rtl_wol_enable_rx() is called via the following call chain if WoL is enabled:
rtl8169_down()
-> rtl_prepare_power_down()
-> rtl_wol_enable_rx()
Therefore we don't have to call this function here.

[...]

Here is the summary with links:
- [net-next] r8169: remove not needed call to rtl_wol_enable_rx from rtl_shutdown

    https://git.kernel.org/netdev/net-next/c/17ce76c4985f

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html