diff options
| author | Russell Bryant <russell@ovn.org> | 2016-01-20 11:17:58 -0500 |
|---|---|---|
| committer | Russell Bryant <russell@ovn.org> | 2016-01-21 11:50:01 -0500 |
| commit | 8d24e9c06b15399259c0324fc6c5c83174291014 (patch) | |
| tree | 7821a0195d0c70acb31c6f09e52a056d64c7821f /ovn | |
| parent | ebd3ce14b3cd3cae5380a04eb40faf5f1223fcb4 (diff) | |
| download | openvswitch-8d24e9c06b15399259c0324fc6c5c83174291014.tar.gz | |
ovn-controller: Update check for parent port.
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 <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ovn')
| -rw-r--r-- | ovn/controller/physical.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c index 302bb5728..356c49354 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); |