1 files changed, 2 insertions, 16 deletions

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index b4d74c86586c..1693c8d885f0 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1363,7 +1363,6 @@ static void ipip6_tunnel_setup(struct net_device *dev)
 static int ipip6_tunnel_init(struct net_device *dev)
 {
         struct ip_tunnel *tunnel = netdev_priv(dev);
-        int i;
 
         tunnel->dev = dev;
         tunnel->net = dev_net(dev);
@@ -1372,16 +1371,10 @@ static int ipip6_tunnel_init(struct net_device *dev)
         memcpy(dev->broadcast, &tunnel->parms.iph.daddr, 4);
 
         ipip6_tunnel_bind_dev(dev);
-        dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
+        dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
         if (!dev->tstats)
                 return -ENOMEM;
 
-        for_each_possible_cpu(i) {
-                struct pcpu_sw_netstats *ipip6_tunnel_stats;
-                ipip6_tunnel_stats = per_cpu_ptr(dev->tstats, i);
-                u64_stats_init(&ipip6_tunnel_stats->syncp);
-        }
-
         tunnel->dst_cache = alloc_percpu(struct ip_tunnel_dst);
         if (!tunnel->dst_cache) {
                 free_percpu(dev->tstats);
@@ -1397,7 +1390,6 @@ static int __net_init ipip6_fb_tunnel_init(struct net_device *dev)
         struct iphdr *iph = &tunnel->parms.iph;
         struct net *net = dev_net(dev);
         struct sit_net *sitn = net_generic(net, sit_net_id);
-        int i;
 
         tunnel->dev = dev;
         tunnel->net = dev_net(dev);
@@ -1408,16 +1400,10 @@ static int __net_init ipip6_fb_tunnel_init(struct net_device *dev)
         iph->ihl                = 5;
         iph->ttl                = 64;
 
-        dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
+        dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
         if (!dev->tstats)
                 return -ENOMEM;
 
-        for_each_possible_cpu(i) {
-                struct pcpu_sw_netstats *ipip6_fb_stats;
-                ipip6_fb_stats = per_cpu_ptr(dev->tstats, i);
-                u64_stats_init(&ipip6_fb_stats->syncp);
-        }
-
         tunnel->dst_cache = alloc_percpu(struct ip_tunnel_dst);
         if (!tunnel->dst_cache) {
                 free_percpu(dev->tstats);