From: Heiner Kallweit <hkallwe...@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 <aa...@kde.org> > Fixes: 7edf6d314cd0 ("r8169: disable WOL per default") > Signed-off-by: Heiner Kallweit <hkallwe...@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.
