This is my favorite type of change :)
Acked-by: Mark Michelson <[email protected]>
On 3/30/22 01:49, Han Zhou wrote:
This is not needed any more and force_crossproduct is always false.
Signed-off-by: Han Zhou <[email protected]>
---
lib/expr.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/lib/expr.c b/lib/expr.c
index 47ef6108e..77c67cde4 100644
--- a/lib/expr.c
+++ b/lib/expr.c
@@ -33,19 +33,6 @@
VLOG_DEFINE_THIS_MODULE(expr);
-/* Right now conjunction flows generated by ovn-controller
- * has issues. If there are multiple flows with the same
- * match for different conjunctions, ovn-controller doesn't
- * handle it properly.
- * Eg.
- * match 1 - ip4.src == {IP1, IP2} && tcp.dst >=500 && tcp.src <=600
- * action - drop
- *
- * match 2 - ip4.src == {IP1, IP2} && tcp.dst >=700 && tcp.src <=800
- * action - allow.
- */
-static bool force_crossproduct = false;
-
static struct expr *parse_and_annotate(const char *s,
const struct shash *symtab,
struct ovs_list *nesting,
@@ -2916,7 +2903,7 @@ expr_normalize_and(struct expr *expr)
ovs_assert(sub->type == EXPR_T_OR);
const struct expr_symbol *symbol = expr_get_unique_symbol(sub);
- if (!symbol || force_crossproduct || symbol->must_crossproduct ) {
+ if (!symbol || symbol->must_crossproduct) {
struct expr *or = expr_create_andor(EXPR_T_OR);
struct expr *k;
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
