Commit 4b6c7879 authored Oct 15, 2013 by Vlad Yasevich Committed by David S. Miller Oct 17, 2013

bridge: Correctly clamp MAX forward_delay when enabling STP



Commit be4f154d
	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>

parent 8f26fb1c

net/bridge/br_stp_if.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {