[PATCH 9/9 net-next] ipv4: use dev_sw_netstats_rx_add()

[Fabian Frederick]

use new helper for netstats settings

Signed-off-by: Fabian Frederick <f...@skynet.be>
---
 net/ipv4/ip_tunnel.c | 8 +-------
 net/ipv4/ip_vti.c    | 9 +--------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 0c1f364044715..8b04d1dcfec4e 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -360,7 +360,6 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff 
*skb,
                  const struct tnl_ptk_info *tpi, struct metadata_dst *tun_dst,
                  bool log_ecn_error)
 {
-       struct pcpu_sw_netstats *tstats;
        const struct iphdr *iph = ip_hdr(skb);
        int err;
 
@@ -402,12 +401,7 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff 
*skb,
                }
        }
 
-       tstats = this_cpu_ptr(tunnel->dev->tstats);
-       u64_stats_update_begin(&tstats->syncp);
-       tstats->rx_packets++;
-       tstats->rx_bytes += skb->len;
-       u64_stats_update_end(&tstats->syncp);
-
+       dev_sw_netstats_rx_add(tunnel->dev, skb->len);
        skb_scrub_packet(skb, !net_eq(tunnel->net, dev_net(tunnel->dev)));
 
        if (tunnel->dev->type == ARPHRD_ETHER) {
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 49daaed897649..6500e8bce8bd4 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -95,7 +95,6 @@ static int vti_rcv_cb(struct sk_buff *skb, int err)
 {
        unsigned short family;
        struct net_device *dev;
-       struct pcpu_sw_netstats *tstats;
        struct xfrm_state *x;
        const struct xfrm_mode *inner_mode;
        struct ip_tunnel *tunnel = XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip4;
@@ -138,13 +137,7 @@ static int vti_rcv_cb(struct sk_buff *skb, int err)
 
        skb_scrub_packet(skb, !net_eq(tunnel->net, dev_net(skb->dev)));
        skb->dev = dev;
-
-       tstats = this_cpu_ptr(dev->tstats);
-
-       u64_stats_update_begin(&tstats->syncp);
-       tstats->rx_packets++;
-       tstats->rx_bytes += skb->len;
-       u64_stats_update_end(&tstats->syncp);
+       dev_sw_netstats_rx_add(dev, skb->len);
 
        return 0;
 }
-- 
2.28.0