Commit 18041b52 authored Jul 24, 2018 by Heiner Kallweit Committed by David S. Miller Jul 24, 2018

r8169: restore previous behavior to accept BIOS WoL settings

Commit 7edf6d31 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: 7edf6d31 ("r8169: disable WOL per default")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 049f5604

drivers/net/ethernet/realtek/r8169.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;