Message ID | 1488892290-106534-3-git-send-email-nic@opencloud.tech |
---|---|
State | Accepted |
Headers | show |
On Tue, Mar 07, 2017 at 05:11:29AM -0800, nickcooper-zhangtonghao wrote:
> Signed-off-by: nickcooper-zhangtonghao <nic@opencloud.tech>
Thanks for the bug fix. I applied this to master, branch-2.7, and
branch-2.6.
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 2e10013..961ebe6 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -1538,7 +1538,7 @@ bridge_configure_stp(struct bridge *br, bool enable_stp) STP_DEFAULT_HELLO_TIME); br_s.max_age = smap_get_ullong(&br->cfg->other_config, "stp-max-age", - STP_DEFAULT_HELLO_TIME / 1000) * 1000; + STP_DEFAULT_MAX_AGE / 1000) * 1000; br_s.fwd_delay = smap_get_ullong(&br->cfg->other_config, "stp-forward-delay", STP_DEFAULT_FWD_DELAY / 1000) * 1000;
Signed-off-by: nickcooper-zhangtonghao <nic@opencloud.tech> --- vswitchd/bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)