diff mbox series

[ovs-dev,v3,ovn,1/2] ovn-northd: Fix ipv4.mcast logical field.

Message ID 20200129092858.6234.4176.stgit@dceara.remote.csb
State Accepted
Headers show
Series Add MLD support. | expand

Commit Message

Dumitru Ceara Jan. 29, 2020, 9:28 a.m. UTC
Acked-by: Mark Michelson <mmichels@redhat.com>
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
---
 lib/logical-fields.c |    3 ++-
 northd/ovn-northd.c  |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/lib/logical-fields.c b/lib/logical-fields.c
index 8fb591c..5748b67 100644
--- a/lib/logical-fields.c
+++ b/lib/logical-fields.c
@@ -158,7 +158,8 @@  ovn_init_symtab(struct shash *symtab)
     expr_symtab_add_field(symtab, "ip4.dst", MFF_IPV4_DST, "ip4", false);
     expr_symtab_add_predicate(symtab, "ip4.src_mcast",
                               "ip4.src[28..31] == 0xe");
-    expr_symtab_add_predicate(symtab, "ip4.mcast", "ip4.dst[28..31] == 0xe");
+    expr_symtab_add_predicate(symtab, "ip4.mcast",
+                              "eth.mcast && ip4.dst[28..31] == 0xe");
 
     expr_symtab_add_predicate(symtab, "icmp4", "ip4 && ip.proto == 1");
     expr_symtab_add_field(symtab, "icmp4.type", MFF_ICMPV4_TYPE, "icmp4",
diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c
index 1e26098..e11d614 100644
--- a/northd/ovn-northd.c
+++ b/northd/ovn-northd.c
@@ -6305,7 +6305,7 @@  build_lswitch_flows(struct hmap *datapaths, struct hmap *ports,
              * ports - RFC 4541, section 2.1.2, item 2.
              */
             ovn_lflow_add(lflows, od, S_SWITCH_IN_L2_LKUP, 85,
-                          "ip4 && ip4.dst == 224.0.0.0/24",
+                          "ip4.mcast && ip4.dst == 224.0.0.0/24",
                           "outport = \""MC_FLOOD"\"; output;");
 
             /* Forward uregistered IP multicast to routers with relay enabled