diff options
Diffstat (limited to 'net/openvswitch/flow.c')
-rw-r--r-- | net/openvswitch/flow.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index dca3b1e2acf0..bc89e16e0505 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c | |||
@@ -59,7 +59,7 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies) | |||
59 | void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags, | 59 | void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags, |
60 | const struct sk_buff *skb) | 60 | const struct sk_buff *skb) |
61 | { | 61 | { |
62 | struct flow_stats *stats; | 62 | struct sw_flow_stats *stats; |
63 | unsigned int cpu = smp_processor_id(); | 63 | unsigned int cpu = smp_processor_id(); |
64 | int len = skb->len + (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0); | 64 | int len = skb->len + (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0); |
65 | 65 | ||
@@ -87,7 +87,7 @@ void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags, | |||
87 | if (likely(flow->stats_last_writer != -1) && | 87 | if (likely(flow->stats_last_writer != -1) && |
88 | likely(!rcu_access_pointer(flow->stats[cpu]))) { | 88 | likely(!rcu_access_pointer(flow->stats[cpu]))) { |
89 | /* Try to allocate CPU-specific stats. */ | 89 | /* Try to allocate CPU-specific stats. */ |
90 | struct flow_stats *new_stats; | 90 | struct sw_flow_stats *new_stats; |
91 | 91 | ||
92 | new_stats = | 92 | new_stats = |
93 | kmem_cache_alloc_node(flow_stats_cache, | 93 | kmem_cache_alloc_node(flow_stats_cache, |
@@ -134,7 +134,7 @@ void ovs_flow_stats_get(const struct sw_flow *flow, | |||
134 | 134 | ||
135 | /* We open code this to make sure cpu 0 is always considered */ | 135 | /* We open code this to make sure cpu 0 is always considered */ |
136 | for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, &flow->cpu_used_mask)) { | 136 | for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, &flow->cpu_used_mask)) { |
137 | struct flow_stats *stats = rcu_dereference_ovsl(flow->stats[cpu]); | 137 | struct sw_flow_stats *stats = rcu_dereference_ovsl(flow->stats[cpu]); |
138 | 138 | ||
139 | if (stats) { | 139 | if (stats) { |
140 | /* Local CPU may write on non-local stats, so we must | 140 | /* Local CPU may write on non-local stats, so we must |
@@ -158,7 +158,7 @@ void ovs_flow_stats_clear(struct sw_flow *flow) | |||
158 | 158 | ||
159 | /* We open code this to make sure cpu 0 is always considered */ | 159 | /* We open code this to make sure cpu 0 is always considered */ |
160 | for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, &flow->cpu_used_mask)) { | 160 | for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, &flow->cpu_used_mask)) { |
161 | struct flow_stats *stats = ovsl_dereference(flow->stats[cpu]); | 161 | struct sw_flow_stats *stats = ovsl_dereference(flow->stats[cpu]); |
162 | 162 | ||
163 | if (stats) { | 163 | if (stats) { |
164 | spin_lock_bh(&stats->lock); | 164 | spin_lock_bh(&stats->lock); |