aboutsummaryrefslogtreecommitdiffstats
path: root/net/openvswitch/vport.c
diff options
context:
space:
mode:
authorLi RongQing <roy.qing.li@gmail.com>2014-01-04 00:57:59 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-04 20:10:24 -0500
commit8f84985fec10de64a6b4cdfea45f2b0ab8f07c78 (patch)
tree03d58e9d72384e8066a6232c793b3ee4242668f6 /net/openvswitch/vport.c
parent653864d9dd6ae26d884abfd53420e61e7383b1da (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 'net/openvswitch/vport.c')
-rw-r--r--net/openvswitch/vport.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index d830a95f03a4..f5275dd29cd9 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -136,14 +136,14 @@ struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *ops,
136 vport->ops = ops; 136 vport->ops = ops;
137 INIT_HLIST_NODE(&vport->dp_hash_node); 137 INIT_HLIST_NODE(&vport->dp_hash_node);
138 138
139 vport->percpu_stats = alloc_percpu(struct pcpu_tstats); 139 vport->percpu_stats = alloc_percpu(struct pcpu_sw_netstats);
140 if (!vport->percpu_stats) { 140 if (!vport->percpu_stats) {
141 kfree(vport); 141 kfree(vport);
142 return ERR_PTR(-ENOMEM); 142 return ERR_PTR(-ENOMEM);
143 } 143 }
144 144
145 for_each_possible_cpu(i) { 145 for_each_possible_cpu(i) {
146 struct pcpu_tstats *vport_stats; 146 struct pcpu_sw_netstats *vport_stats;
147 vport_stats = per_cpu_ptr(vport->percpu_stats, i); 147 vport_stats = per_cpu_ptr(vport->percpu_stats, i);
148 u64_stats_init(&vport_stats->syncp); 148 u64_stats_init(&vport_stats->syncp);
149 } 149 }
@@ -275,8 +275,8 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
275 spin_unlock_bh(&vport->stats_lock); 275 spin_unlock_bh(&vport->stats_lock);
276 276
277 for_each_possible_cpu(i) { 277 for_each_possible_cpu(i) {
278 const struct pcpu_tstats *percpu_stats; 278 const struct pcpu_sw_netstats *percpu_stats;
279 struct pcpu_tstats local_stats; 279 struct pcpu_sw_netstats local_stats;
280 unsigned int start; 280 unsigned int start;
281 281
282 percpu_stats = per_cpu_ptr(vport->percpu_stats, i); 282 percpu_stats = per_cpu_ptr(vport->percpu_stats, i);
@@ -344,7 +344,7 @@ int ovs_vport_get_options(const struct vport *vport, struct sk_buff *skb)
344void ovs_vport_receive(struct vport *vport, struct sk_buff *skb, 344void ovs_vport_receive(struct vport *vport, struct sk_buff *skb,
345 struct ovs_key_ipv4_tunnel *tun_key) 345 struct ovs_key_ipv4_tunnel *tun_key)
346{ 346{
347 struct pcpu_tstats *stats; 347 struct pcpu_sw_netstats *stats;
348 348
349 stats = this_cpu_ptr(vport->percpu_stats); 349 stats = this_cpu_ptr(vport->percpu_stats);
350 u64_stats_update_begin(&stats->syncp); 350 u64_stats_update_begin(&stats->syncp);
@@ -370,7 +370,7 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb)
370 int sent = vport->ops->send(vport, skb); 370 int sent = vport->ops->send(vport, skb);
371 371
372 if (likely(sent > 0)) { 372 if (likely(sent > 0)) {
373 struct pcpu_tstats *stats; 373 struct pcpu_sw_netstats *stats;
374 374
375 stats = this_cpu_ptr(vport->percpu_stats); 375 stats = this_cpu_ptr(vport->percpu_stats);
376 376