From owner-cvs-all@FreeBSD.ORG Fri Apr 18 07:48:25 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: by hub.freebsd.org (Postfix, from userid 758) id 7EC701065671; Fri, 18 Apr 2008 07:48:25 +0000 (UTC) Date: Fri, 18 Apr 2008 07:48:25 +0000 From: Kris Kennaway To: Andrew Thompson Message-ID: <20080418074825.GT25623@hub.freebsd.org> References: <200804172201.m3HM1djs008290@repoman.freebsd.org> <20080417221427.GD21457@citylink.fud.org.nz> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080417221427.GD21457@citylink.fud.org.nz> User-Agent: Mutt/1.4.2.1i Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org, Coleman Kane 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 07:48:25 -0000 On Fri, Apr 18, 2008 at 10:14:27AM +1200, Andrew Thompson wrote: > 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 :) Hah, I had made a note to check that later. Thanks! :) Kris -- In God we Trust -- all others must submit an X.509 certificate. -- Charles Forsythe