diff options
| author | Vlad Yasevich <vyasevich@gmail.com> | 2015-11-10 12:15:32 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-10 21:41:36 +0100 |
| commit | 8a921265e2cd31e61a0c2eda582af54c5bfef897 (patch) | |
| tree | 39fcefd08dd897840cc92ea1969cf354046aa06d /net | |
| parent | bpf_trace: Make dependent on PERF_EVENTS (diff) | |
| download | linux-8a921265e2cd31e61a0c2eda582af54c5bfef897.tar.xz linux-8a921265e2cd31e61a0c2eda582af54c5bfef897.zip | |
Revert "bridge: Allow forward delay to be cfgd when STP enabled"
This reverts commit 34c2d9fb0498c066afbe610b15e18995fd8be792.
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 <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_stp.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index 80c34d70218c..f7e8dee64fc8 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -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; } |