Message ID | 1444674455-15012-1-git-send-email-blp@nicira.com |
---|---|
State | Accepted |
Headers | show |
On Mon, Oct 12, 2015 at 11:27 AM, Ben Pfaff <blp@nicira.com> wrote: > Signed-off-by: Ben Pfaff <blp@nicira.com> > --- > vswitchd/bridge.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Acked-by: Andy Zhou <azhou@nicira.com>
On Mon, Oct 12, 2015 at 11:31:29AM -0700, Andy Zhou wrote: > On Mon, Oct 12, 2015 at 11:27 AM, Ben Pfaff <blp@nicira.com> wrote: > > Signed-off-by: Ben Pfaff <blp@nicira.com> > > --- > > vswitchd/bridge.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > Acked-by: Andy Zhou <azhou@nicira.com> Thanks Andy, I applied this to master.
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 232a334..b966d92 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -1046,8 +1046,9 @@ bridge_configure_datapath_id(struct bridge *br) static uint32_t bridge_get_allowed_versions(struct bridge *br) { - if (!br->cfg->n_protocols) + if (!br->cfg->n_protocols) { return 0; + } return ofputil_versions_from_strings(br->cfg->protocols, br->cfg->n_protocols);
Signed-off-by: Ben Pfaff <blp@nicira.com> --- vswitchd/bridge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)