diff options
| author | Li RongQing <roy.qing.li@gmail.com> | 2014-01-04 06:57:59 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-05 02:10:24 +0100 |
| commit | 8f84985fec10de64a6b4cdfea45f2b0ab8f07c78 (patch) | |
| tree | 03d58e9d72384e8066a6232c793b3ee4242668f6 /net/openvswitch/vport.h | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh... (diff) | |
| download | linux-8f84985fec10de64a6b4cdfea45f2b0ab8f07c78.tar.xz 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 'net/openvswitch/vport.h')
| -rw-r--r-- | net/openvswitch/vport.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h index 1a9fbcec6e1b..bc97ef7fa2af 100644 --- a/net/openvswitch/vport.h +++ b/net/openvswitch/vport.h @@ -87,7 +87,7 @@ struct vport { struct hlist_node dp_hash_node; const struct vport_ops *ops; - struct pcpu_tstats __percpu *percpu_stats; + struct pcpu_sw_netstats __percpu *percpu_stats; spinlock_t stats_lock; struct vport_err_stats err_stats; |