From patchwork Tue Mar 7 13:11:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nickcooper-zhangtonghao X-Patchwork-Id: 736159 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vcxsb3xstz9sNg for ; Wed, 8 Mar 2017 00:12:51 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 1EFE7BC0; Tue, 7 Mar 2017 13:11:56 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id B80DFBBC for ; Tue, 7 Mar 2017 13:11:54 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from smtpbgsg2.qq.com (smtpbgsg2.qq.com [54.254.200.128]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 914C712F for ; Tue, 7 Mar 2017 13:11:53 +0000 (UTC) X-QQ-mid: bizesmtp8t1488892306tq3ailh6i Received: from local.opencloud.tech.localdomai (unknown [106.120.127.11]) by esmtp4.qq.com (ESMTP) with id ; Tue, 07 Mar 2017 21:11:45 +0800 (CST) X-QQ-SSF: 01100000002000F0FF70B00A0000000 X-QQ-FEAT: Euuz9Hb9fOFciXjbNzSDYkUSCi/AoYXZVxCy4Iz85nRZ3ii45tBz3zmrAyjl1 nW1a0tDWCXN3n8Gfw1LfJdePmAx984VnF+O3nwQzGDOnzRvaJEPB4zMFh2HtDYjgFoeZrS+ 3ozxLKl8QDRpA578ZUj5Klg/aI8TCjL8t9AXMaiChgvMSn4R1rUZSDQsGg+xENSYXOfWP4q KOB0WHvUV4pehFKZrP+tHyJ0Vzn4NdSpzEBhwpLGd3sNKdOVJPUlqfnlb+zM3mlzyMyrjYu MDSLbKOdGUmIeg X-QQ-GoodBg: 0 From: nickcooper-zhangtonghao To: dev@openvswitch.org Date: Tue, 7 Mar 2017 05:11:29 -0800 Message-Id: <1488892290-106534-3-git-send-email-nic@opencloud.tech> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1488892290-106534-1-git-send-email-nic@opencloud.tech> References: <1488892290-106534-1-git-send-email-nic@opencloud.tech> X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 3/4] stp: Set BPDU max age exactly. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Signed-off-by: nickcooper-zhangtonghao --- vswitchd/bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;