]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
r8169: move updating counters to rtl8169_down
authorHeiner Kallweit <hkallweit1@gmail.com>
Wed, 17 Jun 2020 20:54:54 +0000 (22:54 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Jun 2020 03:38:36 +0000 (20:38 -0700)
Counters are updated whenever we go down, therefore move the call to
rtl8169_down().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/realtek/r8169_main.c

index afcdaace2716500cb8dd75868ac2bcdee636392a..9f99b3f076d8b9925763603f7b71879a47f47f46 100644 (file)
@@ -4638,6 +4638,8 @@ static void rtl8169_down(struct rtl8169_private *tp)
 
        phy_stop(tp->phydev);
 
+       rtl8169_update_counters(tp);
+
        rtl8169_cleanup(tp, true);
 
        rtl_pll_power_down(tp);
@@ -4652,9 +4654,6 @@ static int rtl8169_close(struct net_device *dev)
 
        pm_runtime_get_sync(&pdev->dev);
 
-       /* Update counters before going down */
-       rtl8169_update_counters(tp);
-
        netif_stop_queue(dev);
        rtl8169_down(tp);
        rtl8169_rx_clear(tp);
@@ -4875,9 +4874,6 @@ static int rtl8169_runtime_suspend(struct device *device)
 
        rtl8169_net_suspend(tp);
 
-       /* Update counters before going runtime suspend */
-       rtl8169_update_counters(tp);
-
        return 0;
 }