diff options
| author | Li RongQing | 2014-01-04 06:57:59 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-01-05 02:10:24 +0100 |
| commit | 8f84985fec10de64a6b4cdfea45f2b0ab8f07c78 (patch) | |
| tree | 03d58e9d72384e8066a6232c793b3ee4242668f6 /include/linux/if_tunnel.h | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh... (diff) | |
| download | kernel-qcow2-linux-8f84985fec10de64a6b4cdfea45f2b0ab8f07c78.tar.gz kernel-qcow2-linux-8f84985fec10de64a6b4cdfea45f2b0ab8f07c78.tar.xz kernel-qcow2-linux-8f84985fec10de64a6b4cdfea45f2b0ab8f07c78.zip | |
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/linux/if_tunnel.h')
| -rw-r--r-- | include/linux/if_tunnel.h | 9 |
1 files changed, 0 insertions, 9 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_ */ |