r8169: fix WoL device wakeup enable

hkallweit · davem330 · commit 3bd826451103 · 2018-12-30T20:25:46.000-08:00
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: 433f9d0 ("r8169: improve saved_wolopts handling") Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1477,6 +1477,8 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts)`
`1477`	`1477`	`}`
`1478`	`1478`
`1479`	`1479`	`RTL_W8(tp, Cfg9346, Cfg9346_Lock);`
	`1480`	`+`
	`1481`	`+ device_set_wakeup_enable(tp_to_dev(tp), wolopts);`
`1480`	`1482`	`}`
`1481`	`1483`
`1482`	`1484`	`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)`
`1498`	`1500`
`1499`	`1501`	`rtl_unlock_work(tp);`
`1500`	`1502`
`1501`		`- device_set_wakeup_enable(d, tp->saved_wolopts);`
`1502`		`-`
`1503`	`1503`	`pm_runtime_put_noidle(d);`
`1504`	`1504`
`1505`	`1505`	`return 0;`