From: Heiner Kallweit hkallweit1@gmail.com
[ Upstream commit 59715171fbd0172a579576f46821031800a63bc5 ]
(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 Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/net/ethernet/realtek/r8169.c | 3 +++ 1 file changed, 3 insertions(+)
--- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6814,6 +6814,8 @@ static int rtl8169_resume(struct 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)) @@ -6847,6 +6849,7 @@ static int rtl8169_runtime_resume(struct { 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)