diff options
Diffstat (limited to 'net/ipv4/ip_gre.c')
-rw-r--r-- | net/ipv4/ip_gre.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 7240f8e2dd45..37000ae24c55 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
@@ -171,15 +171,6 @@ struct ipgre_net { | |||
171 | #define for_each_ip_tunnel_rcu(start) \ | 171 | #define for_each_ip_tunnel_rcu(start) \ |
172 | for (t = rcu_dereference(start); t; t = rcu_dereference(t->next)) | 172 | for (t = rcu_dereference(start); t; t = rcu_dereference(t->next)) |
173 | 173 | ||
174 | /* often modified stats are per cpu, other are shared (netdev->stats) */ | ||
175 | struct pcpu_tstats { | ||
176 | u64 rx_packets; | ||
177 | u64 rx_bytes; | ||
178 | u64 tx_packets; | ||
179 | u64 tx_bytes; | ||
180 | struct u64_stats_sync syncp; | ||
181 | }; | ||
182 | |||
183 | static struct rtnl_link_stats64 *ipgre_get_stats64(struct net_device *dev, | 174 | static struct rtnl_link_stats64 *ipgre_get_stats64(struct net_device *dev, |
184 | struct rtnl_link_stats64 *tot) | 175 | struct rtnl_link_stats64 *tot) |
185 | { | 176 | { |
@@ -753,7 +744,6 @@ drop: | |||
753 | static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | 744 | static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) |
754 | { | 745 | { |
755 | struct ip_tunnel *tunnel = netdev_priv(dev); | 746 | struct ip_tunnel *tunnel = netdev_priv(dev); |
756 | struct pcpu_tstats *tstats; | ||
757 | const struct iphdr *old_iph = ip_hdr(skb); | 747 | const struct iphdr *old_iph = ip_hdr(skb); |
758 | const struct iphdr *tiph; | 748 | const struct iphdr *tiph; |
759 | struct flowi4 fl4; | 749 | struct flowi4 fl4; |
@@ -977,9 +967,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev | |||
977 | } | 967 | } |
978 | } | 968 | } |
979 | 969 | ||
980 | nf_reset(skb); | 970 | iptunnel_xmit(skb, dev); |
981 | tstats = this_cpu_ptr(dev->tstats); | ||
982 | __IPTUNNEL_XMIT(tstats, &dev->stats); | ||
983 | return NETDEV_TX_OK; | 971 | return NETDEV_TX_OK; |
984 | 972 | ||
985 | #if IS_ENABLED(CONFIG_IPV6) | 973 | #if IS_ENABLED(CONFIG_IPV6) |