From e2ea1f9da8f30421eab6e36b906236642568769b Mon Sep 17 00:00:00 2001 From: Andy Zhou Date: Fri, 21 Jun 2013 18:21:45 -0700 Subject: [PATCH] remove mask_list NULL check Signed-off-by: Andy Zhou --- datapath/flow.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/datapath/flow.c b/datapath/flow.c index ad8d62c..9730cb9 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -485,10 +485,8 @@ static void __flow_tbl_destroy(struct flow_table *table) } } - if (table->mask_list) { - BUG_ON(!list_empty(table->mask_list)); - kfree(table->mask_list); - } + BUG_ON(!list_empty(table->mask_list)); + kfree(table->mask_list); skip_flows: free_buckets(table->buckets); @@ -1051,15 +1049,12 @@ struct sw_flow *ovs_flow_lookup(struct flow_table *tbl, const struct sw_flow_key *key) { struct sw_flow *flow = NULL; + struct sw_flow_mask *mask; - if (tbl->mask_list) { - struct sw_flow_mask *mask; - - list_for_each_entry_rcu(mask, tbl->mask_list, list) { - flow = ovs_masked_flow_lookup(tbl, key, mask); - if (flow) /* Found */ - break; - } + list_for_each_entry_rcu(mask, tbl->mask_list, list) { + flow = ovs_masked_flow_lookup(tbl, key, mask); + if (flow) /* Found */ + break; } return flow; @@ -1869,9 +1864,6 @@ struct sw_flow_mask *ovs_sw_flow_mask_find(const struct flow_table *tbl, { struct list_head *ml; - if (!tbl->mask_list) - return NULL; - list_for_each(ml, tbl->mask_list) { struct sw_flow_mask *m; m = container_of(ml, struct sw_flow_mask, list); -- 1.7.9.5