When deleting flows, only insist on matching priority with strict matching.

(The code before this change would only ever delete flows if strict
matching was turned on.)

diff --git a/datapath/table-linear.c b/datapath/table-linear.c
index 2275c48698aabae4b03c5f3816190ff4813c6abb..6634303ce94369fcfb8917625d623d575bb020d9 100644 (file)
--- a/datapath/table-linear.c
+++ b/datapath/table-linear.c
@@ -98,7 +98,7 @@ static int table_linear_delete(struct sw_table *swt,
 
        list_for_each_entry_rcu (flow, &tl->flows, node) {
                if (flow_del_matches(&flow->key, key, strict)
-                               && (strict && (flow->priority == priority)))
+                               && (!strict || (flow->priority == priority)))
                        count += do_delete(swt, flow);
        }
        if (count)

diff --git a/switch/table-linear.c b/switch/table-linear.c
index e6b8aed6ab52f1ac9e943578674667ef2aee8a74..6371bc25c795d929514d67a1b5f7bbfdb677275e 100644 (file)
--- a/switch/table-linear.c
+++ b/switch/table-linear.c
@@ -115,7 +115,7 @@ static int table_linear_delete(struct sw_table *swt,
 
     LIST_FOR_EACH_SAFE (flow, n, struct sw_flow, node, &tl->flows) {
         if (flow_del_matches(&flow->key, key, strict)
-                && (strict && (flow->priority == priority))) {
+                && (!strict || (flow->priority == priority))) {
             do_delete(flow);
             count++;
         }