r8169: re-configure WOL settings on resume from hibernation

So far we don't re-configure WOL-related register bits when waking up
from hibernation. I'm not aware of any problem reports, but better
play safe and call __rtl8169_set_wol() in the resume() path too.
To achieve this move calling __rtl8169_set_wol() to
rtl8169_net_resume() and rename the function to rtl8169_runtime_resume().

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_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 04231585ef79afbafe08616a3fd9918eb05097b0..74b01cb1f5bf3fed1827469c3a10ab557b9fb415 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -4804,9 +4804,12 @@ static void rtl8169_net_suspend(struct rtl8169_private *tp)
 
 #ifdef CONFIG_PM
 
-static int rtl8169_net_resume(struct rtl8169_private *tp)
+static int rtl8169_runtime_resume(struct device *dev)
 {
+       struct rtl8169_private *tp = dev_get_drvdata(dev);
+
        rtl_rar_set(tp, tp->dev->dev_addr);
+       __rtl8169_set_wol(tp, tp->saved_wolopts);
 
        if (tp->TxDescArray)
                rtl8169_up(tp);
@@ -4840,7 +4843,7 @@ static int __maybe_unused rtl8169_resume(struct device *device)
        if (tp->mac_version == RTL_GIGA_MAC_VER_37)
                rtl_init_rxcfg(tp);
 
-       return rtl8169_net_resume(tp);
+       return rtl8169_runtime_resume(device);
 }
 
 static int rtl8169_runtime_suspend(struct device *device)
@@ -4860,15 +4863,6 @@ static int rtl8169_runtime_suspend(struct device *device)
        return 0;
 }
 
-static int rtl8169_runtime_resume(struct device *device)
-{
-       struct rtl8169_private *tp = dev_get_drvdata(device);
-
-       __rtl8169_set_wol(tp, tp->saved_wolopts);
-
-       return rtl8169_net_resume(tp);
-}
-
 static int rtl8169_runtime_idle(struct device *device)
 {
        struct rtl8169_private *tp = dev_get_drvdata(device);