diff options
author | Li RongQing <roy.qing.li@gmail.com> | 2014-01-04 00:57:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-04 20:10:24 -0500 |
commit | 8f84985fec10de64a6b4cdfea45f2b0ab8f07c78 (patch) | |
tree | 03d58e9d72384e8066a6232c793b3ee4242668f6 /include/net/ip_tunnels.h | |
parent | 653864d9dd6ae26d884abfd53420e61e7383b1da (diff) |
net: unify the pcpu_tstats and br_cpu_netstats as one
They are same, so unify them as one, pcpu_sw_netstats.
Define pcpu_sw_netstat in netdevice.h, remove pcpu_tstats
from if_tunnel and remove br_cpu_netstats from br_private.h
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip_tunnels.h')
-rw-r--r-- | include/net/ip_tunnels.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index 9e25b1bc31da..cd729becbb07 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h | |||
@@ -162,10 +162,10 @@ struct sk_buff *iptunnel_handle_offloads(struct sk_buff *skb, bool gre_csum, | |||
162 | 162 | ||
163 | static inline void iptunnel_xmit_stats(int err, | 163 | static inline void iptunnel_xmit_stats(int err, |
164 | struct net_device_stats *err_stats, | 164 | struct net_device_stats *err_stats, |
165 | struct pcpu_tstats __percpu *stats) | 165 | struct pcpu_sw_netstats __percpu *stats) |
166 | { | 166 | { |
167 | if (err > 0) { | 167 | if (err > 0) { |
168 | struct pcpu_tstats *tstats = this_cpu_ptr(stats); | 168 | struct pcpu_sw_netstats *tstats = this_cpu_ptr(stats); |
169 | 169 | ||
170 | u64_stats_update_begin(&tstats->syncp); | 170 | u64_stats_update_begin(&tstats->syncp); |
171 | tstats->tx_bytes += err; | 171 | tstats->tx_bytes += err; |