From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Fri, 8 Jan 2021 12:00:13 +0000 (+0100)
Subject: r8169: don't wakeup-enable device on shutdown if WOL is disabled
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bb703e5781d6a3bada3bb8a3f7c5200471094ff5;p=linux.git

r8169: don't wakeup-enable device on shutdown if WOL is disabled

If WOL isn't enabled, then there's no need to enable wakeup from D3
on system shutdown.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 755767b7e7e7e..f06e130512a83 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -4892,7 +4892,7 @@ static void rtl_shutdown(struct pci_dev *pdev)
 			rtl_wol_shutdown_quirk(tp);
 		}
 
-		pci_wake_from_d3(pdev, true);
+		pci_wake_from_d3(pdev, tp->saved_wolopts);
 		pci_set_power_state(pdev, PCI_D3hot);
 	}
 }