r8169: remove not needed call to rtl_wol_enable_rx from rtl_shutdown
authorHeiner Kallweit <hkallweit1@gmail.com>
Mon, 25 Jan 2021 16:55:12 +0000 (17:55 +0100)
committerJakub Kicinski <kuba@kernel.org>
Thu, 28 Jan 2021 00:48:37 +0000 (16:48 -0800)
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>
drivers/net/ethernet/realtek/r8169_main.c

index fb67d8f..475e6f0 100644 (file)
@@ -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);