Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / include / net / ip_tunnels.h

diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index 9e25b1bc31da5b9ca98afc1f6f4e9eb5f3f7e42a..48ed75c21260b8dd17e681021311bb8dae4f2617 100644 (file)
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -40,7 +40,6 @@ struct ip_tunnel_prl_entry {
 
 struct ip_tunnel_dst {
        struct dst_entry __rcu          *dst;
-       spinlock_t                      lock;
 };
 
 struct ip_tunnel {
@@ -162,10 +161,10 @@ struct sk_buff *iptunnel_handle_offloads(struct sk_buff *skb, bool gre_csum,
 
 static inline void iptunnel_xmit_stats(int err,
                                       struct net_device_stats *err_stats,
-                                      struct pcpu_tstats __percpu *stats)
+                                      struct pcpu_sw_netstats __percpu *stats)
 {
        if (err > 0) {
-               struct pcpu_tstats *tstats = this_cpu_ptr(stats);
+               struct pcpu_sw_netstats *tstats = this_cpu_ptr(stats);
 
                u64_stats_update_begin(&tstats->syncp);
                tstats->tx_bytes += err;