1 files changed, 6 insertions, 6 deletions

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 8d7c9867a445..02894216a46d 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -29,7 +29,6 @@
 #include <linux/if.h>
 #include <linux/in.h>
 #include <linux/ip.h>
-#include <linux/if_tunnel.h>
 #include <linux/net.h>
 #include <linux/in6.h>
 #include <linux/netdevice.h>
@@ -102,11 +101,12 @@ struct ip6_tnl_net {
 
 static struct net_device_stats *ip6_get_stats(struct net_device *dev)
 {
-        struct pcpu_tstats sum = { 0 };
+        struct pcpu_sw_netstats sum = { 0 };
         int i;
 
         for_each_possible_cpu(i) {
-                const struct pcpu_tstats *tstats = per_cpu_ptr(dev->tstats, i);
+                const struct pcpu_sw_netstats *tstats =
+                                                   per_cpu_ptr(dev->tstats, i);
 
                 sum.rx_packets += tstats->rx_packets;
                 sum.rx_bytes   += tstats->rx_bytes;
@@ -784,7 +784,7 @@ static int ip6_tnl_rcv(struct sk_buff *skb, __u16 protocol,
 
         if ((t = ip6_tnl_lookup(dev_net(skb->dev), &ipv6h->saddr,
                                         &ipv6h->daddr)) != NULL) {
-                struct pcpu_tstats *tstats;
+                struct pcpu_sw_netstats *tstats;
 
                 if (t->parms.proto != ipproto && t->parms.proto != 0) {
                         rcu_read_unlock();
@@ -1497,12 +1497,12 @@ ip6_tnl_dev_init_gen(struct net_device *dev)
 
         t->dev = dev;
         t->net = dev_net(dev);
-        dev->tstats = alloc_percpu(struct pcpu_tstats);
+        dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
         if (!dev->tstats)
                 return -ENOMEM;
 
         for_each_possible_cpu(i) {
-                struct pcpu_tstats *ip6_tnl_stats;
+                struct pcpu_sw_netstats *ip6_tnl_stats;
                 ip6_tnl_stats = per_cpu_ptr(dev->tstats, i);
                 u64_stats_init(&ip6_tnl_stats->syncp);
         }