r8169: factor out handling rtl8169_stats

Factor out handling the private packet/byte counters to new
functions rtl_get_priv_stats() and rtl_inc_priv_stats().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 9afd1ef576aee85051328eae4a40d1ae3af282d8..7d366b0362cbeae9ee86b0d2646a9f2db1063cd2 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -700,6 +700,27 @@ static bool rtl_supports_eee(struct rtl8169_private *tp)
               tp->mac_version != RTL_GIGA_MAC_VER_39;
 }
 
+static void rtl_get_priv_stats(struct rtl8169_stats *stats,
+                              u64 *pkts, u64 *bytes)
+{
+       unsigned int start;
+
+       do {
+               start = u64_stats_fetch_begin_irq(&stats->syncp);
+               *pkts = stats->packets;
+               *bytes = stats->bytes;
+       } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
+}
+
+static void rtl_inc_priv_stats(struct rtl8169_stats *stats,
+                              u64 pkts, u64 bytes)
+{
+       u64_stats_update_begin(&stats->syncp);
+       stats->packets += pkts;
+       stats->bytes += bytes;
+       u64_stats_update_end(&stats->syncp);
+}
+
 static void rtl_read_mac_from_reg(struct rtl8169_private *tp, u8 *mac, int reg)
 {
        int i;
@@ -4396,10 +4417,7 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp,
        if (tp->dirty_tx != dirty_tx) {
                netdev_completed_queue(dev, pkts_compl, bytes_compl);
 
-               u64_stats_update_begin(&tp->tx_stats.syncp);
-               tp->tx_stats.packets += pkts_compl;
-               tp->tx_stats.bytes += bytes_compl;
-               u64_stats_update_end(&tp->tx_stats.syncp);
+               rtl_inc_priv_stats(&tp->tx_stats, pkts_compl, bytes_compl);
 
                tp->dirty_tx = dirty_tx;
                /* Sync with rtl8169_start_xmit:
@@ -4521,11 +4539,7 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget
 
                napi_gro_receive(&tp->napi, skb);
 
-               u64_stats_update_begin(&tp->rx_stats.syncp);
-               tp->rx_stats.packets++;
-               tp->rx_stats.bytes += pkt_size;
-               u64_stats_update_end(&tp->rx_stats.syncp);
-
+               rtl_inc_priv_stats(&tp->rx_stats, 1, pkt_size);
 release_descriptor:
                rtl8169_mark_to_asic(desc);
        }
@@ -4772,23 +4786,13 @@ rtl8169_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
        struct rtl8169_private *tp = netdev_priv(dev);
        struct pci_dev *pdev = tp->pci_dev;
        struct rtl8169_counters *counters = tp->counters;
-       unsigned int start;
 
        pm_runtime_get_noresume(&pdev->dev);
 
        netdev_stats_to_stats64(stats, &dev->stats);
 
-       do {
-               start = u64_stats_fetch_begin_irq(&tp->rx_stats.syncp);
-               stats->rx_packets = tp->rx_stats.packets;
-               stats->rx_bytes = tp->rx_stats.bytes;
-       } while (u64_stats_fetch_retry_irq(&tp->rx_stats.syncp, start));
-
-       do {
-               start = u64_stats_fetch_begin_irq(&tp->tx_stats.syncp);
-               stats->tx_packets = tp->tx_stats.packets;
-               stats->tx_bytes = tp->tx_stats.bytes;
-       } while (u64_stats_fetch_retry_irq(&tp->tx_stats.syncp, start));
+       rtl_get_priv_stats(&tp->rx_stats, &stats->rx_packets, &stats->rx_bytes);
+       rtl_get_priv_stats(&tp->tx_stats, &stats->tx_packets, &stats->tx_bytes);
 
        /*
         * Fetch additional counter values missing in stats collected by driver