From owner-cvs-all@FreeBSD.ORG  Thu Apr 17 22:44:36 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2AF59106566C;
	Thu, 17 Apr 2008 22:44:36 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from pele.citylink.co.nz (pele.citylink.co.nz [202.8.44.226])
	by mx1.freebsd.org (Postfix) with ESMTP id D66A08FC20;
	Thu, 17 Apr 2008 22:44:35 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from localhost (localhost [127.0.0.1])
	by pele.citylink.co.nz (Postfix) with ESMTP id 2EAE42BC5B;
	Fri, 18 Apr 2008 10:14:32 +1200 (NZST)
X-Virus-Scanned: Debian amavisd-new at citylink.co.nz
Received: from pele.citylink.co.nz ([127.0.0.1])
	by localhost (pele.citylink.co.nz [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 5g-coTLJgIGw; Fri, 18 Apr 2008 10:14:28 +1200 (NZST)
Received: from citylink.fud.org.nz (unknown [202.8.44.45])
	by pele.citylink.co.nz (Postfix) with ESMTP;
	Fri, 18 Apr 2008 10:14:28 +1200 (NZST)
Received: by citylink.fud.org.nz (Postfix, from userid 1001)
	id D73361142A; Fri, 18 Apr 2008 10:14:27 +1200 (NZST)
Date: Fri, 18 Apr 2008 10:14:27 +1200
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Coleman Kane <cokane@FreeBSD.org>
Message-ID: <20080417221427.GD21457@citylink.fud.org.nz>
References: <200804172201.m3HM1djs008290@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200804172201.m3HM1djs008290@repoman.freebsd.org>
User-Agent: Mutt/1.5.17 (2007-11-01)
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/dev/if_ndis if_ndis.c if_ndisvar.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Apr 2008 22:44:36 -0000

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