cvs commit: src/sys/dev/if_ndis if_ndis.c if_ndisvar.h

[Andrew Thompson]

On Thu, Apr 17, 2008 at 10:01:39PM +0000, Coleman Kane wrote:
> cokane      2008-04-17 22:01:39 UTC
> 
>   FreeBSD src repository
> 
>   Modified files:
>     sys/dev/if_ndis      if_ndis.c if_ndisvar.h 
>   Log:
>   Change the timeout(9) usage in if_ndis to a callout(9) implementation,
>   as the former is becoming deprecated and exhibits some extraneous
>   Giant-locking. The new callout(9) is declared MPSAFE, so it may
>   improve concurrency.
>   
>   Tested by:      matteo
>   Silence from:   wpaul
>   MFC after:      1 month
>   
> --- src/sys/dev/if_ndis/if_ndis.c	2008/01/17 20:11:58	1.131
> +++ src/sys/dev/if_ndis/if_ndis.c	2008/04/17 22:01:38	1.132
>  
>  	return;
>  }
> @@ -1939,8 +1935,9 @@ ndis_init(xsc)
>  	if (sc->ndis_block->nmb_checkforhangsecs == 0)
>  		sc->ndis_block->nmb_checkforhangsecs = 3;
>  
> -	sc->ndis_stat_ch = timeout(ndis_tick, sc,
> -	    hz * sc->ndis_block->nmb_checkforhangsecs);
> +	callout_init(&sc->ndis_stat_callout, 1);
                                           ^^^^^^^
  This should be spelled CALLOUT_MPSAFE :)


Andrew