aboutsummaryrefslogtreecommitdiffstats
path: root/net/openvswitch/flow_table.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/openvswitch/flow_table.c')
-rw-r--r--net/openvswitch/flow_table.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c
index 988fd8a94e43..cf3582c5ed70 100644
--- a/net/openvswitch/flow_table.c
+++ b/net/openvswitch/flow_table.c
@@ -66,7 +66,7 @@ void ovs_flow_mask_key(struct sw_flow_key *dst, const struct sw_flow_key *src,
66struct sw_flow *ovs_flow_alloc(void) 66struct sw_flow *ovs_flow_alloc(void)
67{ 67{
68 struct sw_flow *flow; 68 struct sw_flow *flow;
69 struct flow_stats *stats; 69 struct sw_flow_stats *stats;
70 70
71 flow = kmem_cache_zalloc(flow_cache, GFP_KERNEL); 71 flow = kmem_cache_zalloc(flow_cache, GFP_KERNEL);
72 if (!flow) 72 if (!flow)
@@ -110,7 +110,7 @@ static void flow_free(struct sw_flow *flow)
110 for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, &flow->cpu_used_mask)) 110 for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, &flow->cpu_used_mask))
111 if (flow->stats[cpu]) 111 if (flow->stats[cpu])
112 kmem_cache_free(flow_stats_cache, 112 kmem_cache_free(flow_stats_cache,
113 (struct flow_stats __force *)flow->stats[cpu]); 113 (struct sw_flow_stats __force *)flow->stats[cpu]);
114 kmem_cache_free(flow_cache, flow); 114 kmem_cache_free(flow_cache, flow);
115} 115}
116 116
@@ -712,13 +712,13 @@ int ovs_flow_init(void)
712 712
713 flow_cache = kmem_cache_create("sw_flow", sizeof(struct sw_flow) 713 flow_cache = kmem_cache_create("sw_flow", sizeof(struct sw_flow)
714 + (nr_cpu_ids 714 + (nr_cpu_ids
715 * sizeof(struct flow_stats *)), 715 * sizeof(struct sw_flow_stats *)),
716 0, 0, NULL); 716 0, 0, NULL);
717 if (flow_cache == NULL) 717 if (flow_cache == NULL)
718 return -ENOMEM; 718 return -ENOMEM;
719 719
720 flow_stats_cache 720 flow_stats_cache
721 = kmem_cache_create("sw_flow_stats", sizeof(struct flow_stats), 721 = kmem_cache_create("sw_flow_stats", sizeof(struct sw_flow_stats),
722 0, SLAB_HWCACHE_ALIGN, NULL); 722 0, SLAB_HWCACHE_ALIGN, NULL);
723 if (flow_stats_cache == NULL) { 723 if (flow_stats_cache == NULL) {
724 kmem_cache_destroy(flow_cache); 724 kmem_cache_destroy(flow_cache);