From 1a3e6dfb5e2fd5bbb625f637792f91a02767ff3b Mon Sep 17 00:00:00 2001
From: Numan Siddique <nusiddiq@redhat.com>
Date: Mon, 30 Sep 2019 18:45:20 +0530
Subject: [PATCH] Partially revert "Exclude inport and outport symbol tables
 from conjunction."

This partially revers the commit - 298701dbc99645700be41680a43d049cb061847a
as the commit [1] disables the conjunction.

We still need the changes to the tests/ovn.at file.

CC: Han Zhou <hzhou8@ebay.com>
Acked-by: Han Zhou <hzhou8@ebay.com>
Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
---
 lib/expr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ovn/lib/expr.c b/ovn/lib/expr.c
index 64ea0aafa..9b9b6bcca 100644
--- a/ovn/lib/expr.c
+++ b/ovn/lib/expr.c
@@ -1517,7 +1517,7 @@ expr_symtab_add_string(struct shash *symtab, const char *name,
     const struct mf_field *field = mf_from_id(id);
     struct expr_symbol *symbol;
 
-    symbol = add_symbol(symtab, name, 0, prereqs, EXPR_L_NOMINAL, true,
+    symbol = add_symbol(symtab, name, 0, prereqs, EXPR_L_NOMINAL, false,
                         field->writable);
     symbol->field = field;
     return symbol;
-- 
2.23.0