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

hkallweit · kuba-moo · commit bb703e5781d6 · 2021-01-09T18:07:53.000-08:00
If WOL isn't enabled, then there's no need to enable wakeup from D3
on system shutdown.

Signed-off-by: Heiner Kallweit &lt;hkallweit1@gmail.com&gt;
Signed-off-by: Jakub Kicinski &lt;kuba@kernel.org&gt;
diff --git 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);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -4892,7 +4892,7 @@ static void rtl_shutdown(struct pci_dev *pdev)`
`4892`	`4892`	`rtl_wol_shutdown_quirk(tp);`
`4893`	`4893`	`}`
`4894`	`4894`
`4895`		`- pci_wake_from_d3(pdev, true);`
	`4895`	`+ pci_wake_from_d3(pdev, tp->saved_wolopts);`
`4896`	`4896`	`pci_set_power_state(pdev, PCI_D3hot);`
`4897`	`4897`	`}`
`4898`	`4898`	`}`