diff mbox

bridge: Allow forward delay to be cfgd when STP enabled

Message ID 1443118811-9400-1-git-send-email-stephen@networkplumber.org
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Stephen Hemminger Sept. 24, 2015, 6:20 p.m. UTC 
From: Ian Wilson <iwilson@brocade.com>

Allow bridge forward delay to be configured when Spanning Tree is enabled.

Signed-off-by: Ian Wilson <iwilson@brocade.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 net/bridge/br_stp.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

Comments

David Miller Sept. 28, 2015, 2:09 a.m. UTC | #1 
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 24 Sep 2015 11:20:11 -0700

> From: Ian Wilson <iwilson@brocade.com>
> 
> Allow bridge forward delay to be configured when Spanning Tree is enabled.
> 
> Signed-off-by: Ian Wilson <iwilson@brocade.com>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

Applied to net-next, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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;
 }