There were a couple of checks that checked for a parent port as the
field being non-NULL. We should treat an empty string the same as NULL
for this field.
Signed-off-by: Russell Bryant <russ...@ovn.org>
---
v1->v2:
- this patch is new in v2, split out from the last patch.
ovn/controller/physical.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c
index 302bb57..356c493 100644
--- a/ovn/controller/physical.c
+++ b/ovn/controller/physical.c
@@ -279,7 +279,7 @@ physical_run(struct controller_ctx *ctx, enum mf_field_id
mff_ovn_geneve,
if (ofport && binding->tag) {
tag = *binding->tag;
}
- } else if (binding->parent_port) {
+ } else if (binding->parent_port && *binding->parent_port) {
if (!binding->tag) {
continue;
}
@@ -542,7 +542,7 @@ physical_run(struct controller_ctx *ctx, enum mf_field_id
mff_ovn_geneve,
&remote_ofpacts);
put_resubmit(OFTABLE_DROP_LOOPBACK, &remote_ofpacts);
} else if (simap_contains(&localvif_to_ofport,
- port->parent_port
+ (port->parent_port && *port->parent_port)
? port->parent_port : port->logical_port)) {
put_load(port->tunnel_key, MFF_LOG_OUTPORT, 0, 32, &ofpacts);
put_resubmit(OFTABLE_DROP_LOOPBACK, &ofpacts);
--
2.5.0
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
