aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2021-01-25 17:55:12 +0100
committerJakub Kicinski <kuba@kernel.org>2021-01-27 16:48:37 -0800
commit17ce76c4985f166572c7870b86b41dae7b95cb9e (patch)
treec9336566265271a1e9ea7cc4c279c4bc0a36e263
parentpktgen: fix misuse of BUG_ON() in pktgen_thread_worker() (diff)
downloadlinux-dev-17ce76c4985f166572c7870b86b41dae7b95cb9e.tar.xz
linux-dev-17ce76c4985f166572c7870b86b41dae7b95cb9e.zip
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. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Link: https://lore.kernel.org/r/34ce78e2-596c-e2ac-16aa-c550fa624c22@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--drivers/net/ethernet/realtek/r8169_main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index fb67d8f797ec..475e6f01ea10 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -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);