From patchwork Thu Sep 24 18:20:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 522483 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F0AD9140271 for ; Fri, 25 Sep 2015 04:20:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756544AbbIXSUL (ORCPT ); Thu, 24 Sep 2015 14:20:11 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:35041 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755331AbbIXSUJ (ORCPT ); Thu, 24 Sep 2015 14:20:09 -0400 Received: by pacfv12 with SMTP id fv12so81118819pac.2 for ; Thu, 24 Sep 2015 11:20:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vwGrP/1TqMna+4Kr7pRK4phcujmmtvT0LVTKJG13VcU=; b=DiOeI643vm6PyH/meouZPsj5sM9mJNQsOb8xpIRLTWdZw2LrYc1pT8nngYeZ6lN6XN CYfLiNn3lAW+ZxNGoN9daUBNAKekA56K0hC7/OqdkpZFsf+UUTH0ldLwwE7LVJr2Mvvb yKv19DZfD9gOfFMiu918RS+LVz5lfrT7n/rsBHhP6bBT2TUHpBQ+GtT8foDERf8LJ/As cqO4qH5MgjWG68zTy8yu6WeCCaEnEGqEXECEyYFIgejlJ+1qntQ4XvRyM3lV12hcEj6L ONlrryN16v2PNPoVPMnjNWRBFOTGf9BYxZO8T1WM/SIlsu5DpDqPpDjVE9a3geidn0B1 hfEg== X-Gm-Message-State: ALoCoQmvlLqFgGqttMHW3tGQA6ZhKb52VuO3268EAsrt+mKm0fu8l9/8VNOD/M5BZfP+PSGcz8G7 X-Received: by 10.66.236.10 with SMTP id uq10mr1259844pac.55.1443118808914; Thu, 24 Sep 2015 11:20:08 -0700 (PDT) Received: from urahara.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155]) by smtp.gmail.com with ESMTPSA id d13sm14875631pbu.17.2015.09.24.11.20.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Sep 2015 11:20:08 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Ian Wilson , Stephen Hemminger Subject: [PATCH] bridge: Allow forward delay to be cfgd when STP enabled Date: Thu, 24 Sep 2015 11:20:11 -0700 Message-Id: <1443118811-9400-1-git-send-email-stephen@networkplumber.org> X-Mailer: git-send-email 2.1.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ian Wilson Allow bridge forward delay to be configured when Spanning Tree is enabled. Signed-off-by: Ian Wilson Signed-off-by: Stephen Hemminger --- net/bridge/br_stp.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index ed74ffa..3a7392e 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -576,17 +576,12 @@ void __br_set_forward_delay(struct net_bridge *br, unsigned long t) int br_set_forward_delay(struct net_bridge *br, unsigned long val) { unsigned long t = clock_t_to_jiffies(val); - int err = -ERANGE; - spin_lock_bh(&br->lock); - if (br->stp_enabled != BR_NO_STP && - (t < BR_MIN_FORWARD_DELAY || t > BR_MAX_FORWARD_DELAY)) - goto unlock; + if (t < BR_MIN_FORWARD_DELAY || t > BR_MAX_FORWARD_DELAY) + return -ERANGE; + spin_lock_bh(&br->lock); __br_set_forward_delay(br, t); - err = 0; - -unlock: spin_unlock_bh(&br->lock); - return err; + return 0; }