diff options
| author | Vlad Yasevich <vyasevic@redhat.com> | 2013-10-15 20:57:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-17 22:12:15 +0200 |
| commit | 4b6c7879d84ad06a2ac5b964808ed599187a188d (patch) | |
| tree | f7cc8279de66406a399dde8ebb020c4194d853b9 /net | |
| parent | tcp: remove the sk_can_gso() check from tcp_set_skb_tso_segs() (diff) | |
| download | linux-4b6c7879d84ad06a2ac5b964808ed599187a188d.tar.xz linux-4b6c7879d84ad06a2ac5b964808ed599187a188d.zip | |
bridge: Correctly clamp MAX forward_delay when enabling STP
Commit be4f154d5ef0ca147ab6bcd38857a774133f5450
bridge: Clamp forward_delay when enabling STP
had a typo when attempting to clamp maximum forward delay.
It is possible to set bridge_forward_delay to be higher then
permitted maximum when STP is off. When turning STP on, the
higher then allowed delay has to be clamed down to max value.
CC: Herbert Xu <herbert@gondor.apana.org.au>
CC: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Reviewed-by: Veaceslav Falico <vfalico@redhat.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_stp_if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 108084a04671..656a6f3e40de 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -134,7 +134,7 @@ static void br_stp_start(struct net_bridge *br) if (br->bridge_forward_delay < BR_MIN_FORWARD_DELAY) __br_set_forward_delay(br, BR_MIN_FORWARD_DELAY); - else if (br->bridge_forward_delay < BR_MAX_FORWARD_DELAY) + else if (br->bridge_forward_delay > BR_MAX_FORWARD_DELAY) __br_set_forward_delay(br, BR_MAX_FORWARD_DELAY); if (r == 0) { |