Signed-off-by: Mark Michelson <[email protected]>
---
northd/lflow-mgr.h | 8 --------
northd/northd.c | 28 +++++++++++++++-------------
2 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/northd/lflow-mgr.h b/northd/lflow-mgr.h
index c97562227..e3c2739dd 100644
--- a/northd/lflow-mgr.h
+++ b/northd/lflow-mgr.h
@@ -185,14 +185,6 @@ void lflow_table_add_lflow(struct lflow_table *, const
struct ovn_datapath *,
*/
#define DEFAULT_DROP 0, "1", debug_drop_action()
-#define ovn_lflow_add_drop_with_lport_hint_and_desc(LFLOW_TABLE, OD, STAGE, \
- PRIORITY, MATCH, \
- IN_OUT_PORT, STAGE_HINT, \
- DESCRIPTION, LFLOW_REF) \
- lflow_table_add_lflow(LFLOW_TABLE, OD, NULL, 0, STAGE, PRIORITY, MATCH, \
- debug_drop_action(), IN_OUT_PORT, NULL, STAGE_HINT, \
- OVS_SOURCE_LOCATOR, DESCRIPTION, LFLOW_REF)
-
struct sbrec_logical_dp_group;
struct ovn_dp_group {
diff --git a/northd/northd.c b/northd/northd.c
index 8b5a85b26..56e374927 100644
--- a/northd/northd.c
+++ b/northd/northd.c
@@ -9707,11 +9707,12 @@ build_drop_arp_nd_flows_for_unbound_router_ports(struct
ovn_port *op,
port->json_key,
op->lsp_addrs[i].ea_s, op->json_key,
rp->lsp_addrs[k].ipv4_addrs[l].addr_s);
- ovn_lflow_add_drop_with_lport_hint_and_desc(
+ ovn_lflow_add(
lflows, op->od, S_SWITCH_IN_EXTERNAL_PORT, 100,
- ds_cstr(&match), port->key,
- &op->nbsp->header_,
- "Drop ARP for unknown router ports", lflow_ref);
+ ds_cstr(&match), debug_drop_action(), lflow_ref,
+ WITH_IO_PORT(port->key),
+ WITH_HINT(&op->nbsp->header_),
+ WITH_DESC("Drop ARP for unknown router ports"));
}
for (size_t l = 0; l < rp->lsp_addrs[k].n_ipv6_addrs; l++) {
ds_clear(&match);
@@ -9724,11 +9725,12 @@ build_drop_arp_nd_flows_for_unbound_router_ports(struct
ovn_port *op,
rp->lsp_addrs[k].ipv6_addrs[l].addr_s,
rp->lsp_addrs[k].ipv6_addrs[l].sn_addr_s,
rp->lsp_addrs[k].ipv6_addrs[l].addr_s);
- ovn_lflow_add_drop_with_lport_hint_and_desc(
+ ovn_lflow_add(
lflows, op->od, S_SWITCH_IN_EXTERNAL_PORT, 100,
- ds_cstr(&match), port->key,
- &op->nbsp->header_, "Drop ND for unbound router ports",
- lflow_ref);
+ ds_cstr(&match), debug_drop_action(), lflow_ref,
+ WITH_IO_PORT(port->key),
+ WITH_HINT(&op->nbsp->header_),
+ WITH_DESC("Drop ND for unbound router ports"));
}
ds_clear(&match);
@@ -9739,14 +9741,14 @@ build_drop_arp_nd_flows_for_unbound_router_ports(struct
ovn_port *op,
port->json_key,
op->lsp_addrs[i].ea_s, rp->lsp_addrs[k].ea_s,
op->json_key);
- ovn_lflow_add_drop_with_lport_hint_and_desc(
+ ovn_lflow_add(
lflows, op->od,
S_SWITCH_IN_EXTERNAL_PORT,
100, ds_cstr(&match),
- port->key,
- &op->nbsp->header_,
- "Packet does not come from a chassis resident",
- lflow_ref);
+ debug_drop_action(), lflow_ref,
+ WITH_IO_PORT(port->key),
+ WITH_HINT(&op->nbsp->header_),
+ WITH_DESC("Packet does not come from a chassis resident"));
}
}
}
--
2.51.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
