Commit 8a921265 authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller

Revert "bridge: Allow forward delay to be cfgd when STP enabled"

This reverts commit 34c2d9fb.

There are 2 reasons for this revert:
 1)  The commit in question doesn't do what it says it does.  The
     description reads: "Allow bridge forward delay to be configured
     when Spanning Tree is enabled."  This was already the case before
     the commit was made.  What the commit actually do was disallow
     invalid values or 'forward_delay' when STP was turned off.

 2)  The above change was actually a change in the user observed
     behavior and broke things like libvirt and other network configs
     that set 'forward_delay' to 0 without enabling STP.  The value
     of 0 is actually used when STP is turned off to immediately mark
     the bridge as forwarding.
Signed-off-by: default avatarVlad Yasevich <vyasevic@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a31d82d8
...@@ -600,12 +600,17 @@ void __br_set_forward_delay(struct net_bridge *br, unsigned long t) ...@@ -600,12 +600,17 @@ void __br_set_forward_delay(struct net_bridge *br, unsigned long t)
int br_set_forward_delay(struct net_bridge *br, unsigned long val) int br_set_forward_delay(struct net_bridge *br, unsigned long val)
{ {
unsigned long t = clock_t_to_jiffies(val); unsigned long t = clock_t_to_jiffies(val);
int err = -ERANGE;
if (t < BR_MIN_FORWARD_DELAY || t > BR_MAX_FORWARD_DELAY)
return -ERANGE;
spin_lock_bh(&br->lock); spin_lock_bh(&br->lock);
if (br->stp_enabled != BR_NO_STP &&
(t < BR_MIN_FORWARD_DELAY || t > BR_MAX_FORWARD_DELAY))
goto unlock;
__br_set_forward_delay(br, t); __br_set_forward_delay(br, t);
err = 0;
unlock:
spin_unlock_bh(&br->lock); spin_unlock_bh(&br->lock);
return 0; return err;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment