diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2018-12-30 13:16:12 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-31 05:25:46 +0100 |
| commit | 3bd8264511035dc97c902f03fa9f1d07f95f8f62 (patch) | |
| tree | 379c9f5e347e753e6cbe9214c9d7ba50f48aabf9 /drivers/net | |
| parent | netrom: fix locking in nr_find_socket() (diff) | |
| download | linux-3bd8264511035dc97c902f03fa9f1d07f95f8f62.tar.xz linux-3bd8264511035dc97c902f03fa9f1d07f95f8f62.zip | |
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: 433f9d0ddcc6 ("r8169: improve saved_wolopts handling")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 99bc3de906e2..298930d39b79 100644 --- 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; |