l2tp: l2tp_eth: use per-cpu counters from dev->tstats

l2tp_eth uses old-style dev->stats for fastpath packet/byte
counters. Convert it to use dev->tstats per-cpu counters.

Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: Tom Parkin <tparkin@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
index e94549668e1044601571802695234daa53011f6a..15a862f33f76c2c8b40614c44e6d4ffc1ed0c9c8 100644 (file)
--- a/net/l2tp/l2tp_eth.c
+++ b/net/l2tp/l2tp_eth.c
@@ -72,31 +72,19 @@ static netdev_tx_t l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev
        unsigned int len = skb->len;
        int ret = l2tp_xmit_skb(session, skb);
 
-       if (likely(ret == NET_XMIT_SUCCESS)) {
-               DEV_STATS_ADD(dev, tx_bytes, len);
-               DEV_STATS_INC(dev, tx_packets);
-       } else {
+       if (likely(ret == NET_XMIT_SUCCESS))
+               dev_sw_netstats_tx_add(dev, 1, len);
+       else
                DEV_STATS_INC(dev, tx_dropped);
-       }
-       return NETDEV_TX_OK;
-}
 
-static void l2tp_eth_get_stats64(struct net_device *dev,
-                                struct rtnl_link_stats64 *stats)
-{
-       stats->tx_bytes   = DEV_STATS_READ(dev, tx_bytes);
-       stats->tx_packets = DEV_STATS_READ(dev, tx_packets);
-       stats->tx_dropped = DEV_STATS_READ(dev, tx_dropped);
-       stats->rx_bytes   = DEV_STATS_READ(dev, rx_bytes);
-       stats->rx_packets = DEV_STATS_READ(dev, rx_packets);
-       stats->rx_errors  = DEV_STATS_READ(dev, rx_errors);
+       return NETDEV_TX_OK;
 }
 
 static const struct net_device_ops l2tp_eth_netdev_ops = {
        .ndo_init               = l2tp_eth_dev_init,
        .ndo_uninit             = l2tp_eth_dev_uninit,
        .ndo_start_xmit         = l2tp_eth_dev_xmit,
-       .ndo_get_stats64        = l2tp_eth_get_stats64,
+       .ndo_get_stats64        = dev_get_tstats64,
        .ndo_set_mac_address    = eth_mac_addr,
 };
 
@@ -112,6 +100,7 @@ static void l2tp_eth_dev_setup(struct net_device *dev)
        dev->features           |= NETIF_F_LLTX;
        dev->netdev_ops         = &l2tp_eth_netdev_ops;
        dev->needs_free_netdev  = true;
+       dev->pcpu_stat_type     = NETDEV_PCPU_STAT_TSTATS;
 }
 
 static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb, int data_len)
@@ -138,12 +127,11 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
        if (!dev)
                goto error_rcu;
 
-       if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
-               DEV_STATS_INC(dev, rx_packets);
-               DEV_STATS_ADD(dev, rx_bytes, data_len);
-       } else {
+       if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS)
+               dev_sw_netstats_rx_add(dev, data_len);
+       else
                DEV_STATS_INC(dev, rx_errors);
-       }
+
        rcu_read_unlock();
 
        return;