Skip to content

Commit 18041b5

Browse files
hkallweitdavem330
authored andcommitted
r8169: restore previous behavior to accept BIOS WoL settings
Commit 7edf6d3 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 <[email protected]> Fixes: 7edf6d3 ("r8169: disable WOL per default") Signed-off-by: Heiner Kallweit <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 049f560 commit 18041b5

File tree

1 file changed

+1
-2
lines changed
  • drivers/net/ethernet/realtek

1 file changed

+1
-2
lines changed

drivers/net/ethernet/realtek/r8169.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7734,8 +7734,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
77347734
return rc;
77357735
}
77367736

7737-
/* override BIOS settings, use userspace tools to enable WOL */
7738-
__rtl8169_set_wol(tp, 0);
7737+
tp->saved_wolopts = __rtl8169_get_wol(tp);
77397738

77407739
if (rtl_tbi_enabled(tp)) {
77417740
tp->set_speed = rtl8169_set_speed_tbi;

0 commit comments

Comments
 (0)