Re: bridge: Eliminate unnecessary forward delay

[Herbert Xu <herbert@gondor.apana.org.au>]

On Mon, Aug 04, 2008 at 10:27:03AM -0700, Stephen Hemminger wrote:
> 
> How about this, it is simpler just to do the state change.

Sure, that should work as well.

> --- a/net/bridge/br_stp.c	2008-08-04 10:20:21.000000000 -0700
> +++ b/net/bridge/br_stp.c	2008-08-04 10:26:04.000000000 -0700
> @@ -368,14 +368,26 @@ static void br_make_blocking(struct net_
>  /* called under bridge lock */
>  static void br_make_forwarding(struct net_bridge_port *p)
>  {
> -	if (p->state == BR_STATE_BLOCKING) {
> -		if (p->br->stp_enabled == BR_KERNEL_STP)
> -			p->state = BR_STATE_LISTENING;
> -		else
> -			p->state = BR_STATE_LEARNING;
> +	struct net_bridge *br = p->br;
>  
> -		br_log_state(p);
> -		mod_timer(&p->forward_delay_timer, jiffies + p->br->forward_delay);	}
> +	if (p->state != BR_STATE_BLOCKING)
> +		return;
> +
> +	if (br->forward_delay == 0) {
> +		p->state = BR_STATE_FORWARDING;
> +		if (br_is_designated_for_some_port(br))
> +			br_topology_change_detection(br);

Provided that you make br_is_designated_for_some_port available
first :)

Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt