r8169: fix MAC address being lost in PCI D3
authorHeiner Kallweit <hkallweit1@gmail.com>
Wed, 29 May 2019 05:44:01 +0000 (07:44 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 May 2019 18:52:15 +0000 (11:52 -0700)
(At least) RTL8168e forgets its MAC address in PCI D3. To fix this set
the MAC address when resuming. For resuming from runtime-suspend we
had this in place already, for resuming from S3/S5 it was missing.

The commit referenced as being fixed isn't wrong, it's just the first
one where the patch applies cleanly.

Fixes: 0f07bd850d36 ("r8169: use dev_get_drvdata where possible")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reported-by: Albert Astals Cid <aacid@kde.org>
Tested-by: Albert Astals Cid <aacid@kde.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/realtek/r8169.c

index 8e40418..d06a61f 100644 (file)
@@ -6722,6 +6722,8 @@ static int rtl8169_resume(struct device *device)
        struct net_device *dev = dev_get_drvdata(device);
        struct rtl8169_private *tp = netdev_priv(dev);
 
+       rtl_rar_set(tp, dev->dev_addr);
+
        clk_prepare_enable(tp->clk);
 
        if (netif_running(dev))
@@ -6755,6 +6757,7 @@ static int rtl8169_runtime_resume(struct device *device)
 {
        struct net_device *dev = dev_get_drvdata(device);
        struct rtl8169_private *tp = netdev_priv(dev);
+
        rtl_rar_set(tp, dev->dev_addr);
 
        if (!tp->TxDescArray)