2 files changed, 10 insertions, 10 deletions

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index f4e56ecd0b1a..712710bc0580 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -13,13 +13,4 @@
 #define for_each_ip_tunnel_rcu(pos, start) \
         for (pos = rcu_dereference(start); pos; pos = rcu_dereference(pos->next))
 
-/* often modified stats are per cpu, other are shared (netdev->stats) */
-struct pcpu_tstats {
-        u64     rx_packets;
-        u64     rx_bytes;
-        u64     tx_packets;
-        u64     tx_bytes;
-        struct u64_stats_sync   syncp;
-};
-
 #endif /* _IF_TUNNEL_H_ */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index bec60c481966..51c0fe258163 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1409,7 +1409,7 @@ struct net_device {
         union {
                 void                            *ml_priv;
                 struct pcpu_lstats __percpu     *lstats; /* loopback stats */
-                struct pcpu_tstats __percpu     *tstats; /* tunnel stats */
+                struct pcpu_sw_netstats __percpu        *tstats;
                 struct pcpu_dstats __percpu     *dstats; /* dummy stats */
                 struct pcpu_vstats __percpu     *vstats; /* veth stats */
         };
@@ -1685,6 +1685,15 @@ struct packet_offload {
         struct list_head         list;
 };
 
+/* often modified stats are per cpu, other are shared (netdev->stats) */
+struct pcpu_sw_netstats {
+        u64     rx_packets;
+        u64     rx_bytes;
+        u64     tx_packets;
+        u64     tx_bytes;
+        struct u64_stats_sync   syncp;
+};
+
 #include <linux/notifier.h>
 
 /* netdevice notifier chain. Please remember to update the rtnetlink