* [PATCH] bridge: Allow forward delay to be cfgd when STP enabled
@ 2015-09-24 18:20 Stephen Hemminger
2015-09-28 2:09 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Hemminger @ 2015-09-24 18:20 UTC (permalink / raw)
To: netdev; +Cc: Ian Wilson, Stephen Hemminger
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(-)
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;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] bridge: Allow forward delay to be cfgd when STP enabled
2015-09-24 18:20 [PATCH] bridge: Allow forward delay to be cfgd when STP enabled Stephen Hemminger
@ 2015-09-28 2:09 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-09-28 2:09 UTC (permalink / raw)
To: stephen; +Cc: netdev, iwilson
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-09-28 2:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-24 18:20 [PATCH] bridge: Allow forward delay to be cfgd when STP enabled Stephen Hemminger
2015-09-28 2:09 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).