Skip to content

Commit

Permalink
Revert "bridge: Allow forward delay to be cfgd when STP enabled"
Browse files Browse the repository at this point in the history
This reverts commit 34c2d9f.

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: Vlad Yasevich <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
vyasevich authored and davem330 committed Nov 10, 2015
1 parent a31d82d commit 8a92126
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions net/bridge/br_stp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
unsigned long t = clock_t_to_jiffies(val);

if (t < BR_MIN_FORWARD_DELAY || t > BR_MAX_FORWARD_DELAY)
return -ERANGE;
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;

__br_set_forward_delay(br, t);
err = 0;

unlock:
spin_unlock_bh(&br->lock);
return 0;
return err;
}

0 comments on commit 8a92126

Please sign in to comment.