Commit 3bd82645 authored Dec 30, 2018 by Heiner Kallweit Committed by David S. Miller Dec 30, 2018

r8169: fix WoL device wakeup enable



In rtl8169_runtime_resume() we configure WoL but don't set the device
to wakeup-enabled. This prevents PME generation once the cable is
re-plugged. Fix this by moving the call to device_set_wakeup_enable()
to __rtl8169_set_wol().

Fixes: 433f9d0d ("r8169: improve saved_wolopts handling")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7314f548

drivers/net/ethernet/realtek/r8169.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1477,6 +1477,8 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts)
		}

		RTL_W8(tp, Cfg9346, Cfg9346_Lock);

		device_set_wakeup_enable(tp_to_dev(tp), wolopts);
		}

		static int rtl8169_set_wol(struct net_device dev, struct ethtool_wolinfo wol)
		@@ -1498,8 +1500,6 @@ static int rtl8169_set_wol(struct net_device dev, struct ethtool_wolinfo wol)

		rtl_unlock_work(tp);

		device_set_wakeup_enable(d, tp->saved_wolopts);

		pm_runtime_put_noidle(d);

		return 0;