Looks good, thanks. Ethan
On Tue, Apr 17, 2012 at 17:23, Ben Pfaff <[email protected]> wrote: > A VLAN bridge uses its parent's fail-mode, so checking the fail-mode should > verify the parent's bridge record. > > This fixes a bug, but it is unlikely to ever have caused a real problem for > users. > > Found by inspection. > > Signed-off-by: Ben Pfaff <[email protected]> > --- > utilities/ovs-vsctl.c | 5 ++--- > 1 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c > index a5bd647..567defb 100644 > --- a/utilities/ovs-vsctl.c > +++ b/utilities/ovs-vsctl.c > @@ -2071,9 +2071,8 @@ cmd_get_fail_mode(struct vsctl_context *ctx) > get_info(ctx, &info); > br = find_bridge(&info, ctx->argv[1], true); > > - if (br->br_cfg) { > - ovsrec_bridge_verify_fail_mode(br->br_cfg); > - } > + ovsrec_bridge_verify_fail_mode(br->br_cfg > + ? br->br_cfg : br->parent->br_cfg); > if (br->fail_mode && strlen(br->fail_mode)) { > ds_put_format(&ctx->output, "%s\n", br->fail_mode); > } > -- > 1.7.2.5 > > _______________________________________________ > dev mailing list > [email protected] > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
