| Message ID | a989358e-154b-86e4-ec9d-197454350f58@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] r8169: restore previous behavior to accept BIOS WoL settings | expand |
From: Heiner Kallweit <hkallweit1@gmail.com> Date: Tue, 24 Jul 2018 22:21:04 +0200 > Commit 7edf6d314cd0 tried to resolve an inconsistency (BIOS WoL > settings are accepted, but device isn't wakeup-enabled) resulting > from a previous broken-BIOS workaround by making disabled WoL the > default. > This however had some side effects, most likely due to a broken BIOS > some systems don't properly resume from suspend when the MagicPacket > WoL bit isn't set in the chip, see > https://bugzilla.kernel.org/show_bug.cgi?id=200195 > Therefore restore the WoL behavior from 4.16. > > Reported-by: Albert Astals Cid <aacid@kde.org> > Fixes: 7edf6d314cd0 ("r8169: disable WOL per default") > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Applied and queued up for -stable. > This patch will cause a trivial merge conflict when merging net > to net-next. Thanks for the heads up.
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index a3f69901..eaedc11e 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7734,8 +7734,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) return rc; } - /* override BIOS settings, use userspace tools to enable WOL */ - __rtl8169_set_wol(tp, 0); + tp->saved_wolopts = __rtl8169_get_wol(tp); if (rtl_tbi_enabled(tp)) { tp->set_speed = rtl8169_set_speed_tbi;
Commit 7edf6d314cd0 tried to resolve an inconsistency (BIOS WoL settings are accepted, but device isn't wakeup-enabled) resulting from a previous broken-BIOS workaround by making disabled WoL the default. This however had some side effects, most likely due to a broken BIOS some systems don't properly resume from suspend when the MagicPacket WoL bit isn't set in the chip, see https://bugzilla.kernel.org/show_bug.cgi?id=200195 Therefore restore the WoL behavior from 4.16. Reported-by: Albert Astals Cid <aacid@kde.org> Fixes: 7edf6d314cd0 ("r8169: disable WOL per default") Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- This patch will cause a trivial merge conflict when merging net to net-next. --- drivers/net/ethernet/realtek/r8169.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)