svn commit: r193243 - head/sys/net

[Robert Watson]

Author: rwatson
Date: Mon Jun  1 18:38:36 2009
New Revision: 193243
URL: http://svn.freebsd.org/changeset/base/193243

Log:
  Revert a recent netisr2 change: when billing packets to the current
  CPU, don't lock the workstream, as its mutexes may not have been
  initialized if there are fewer workstreams than CPUs.
  
  Run into by:	hps, ps

Modified:
  head/sys/net/netisr.c

Modified: head/sys/net/netisr.c
==============================================================================
--- head/sys/net/netisr.c	Mon Jun  1 18:27:16 2009	(r193242)
+++ head/sys/net/netisr.c	Mon Jun  1 18:38:36 2009	(r193243)
@@ -893,10 +893,8 @@ netisr_dispatch_src(u_int proto, uintptr
 	if (netisr_direct_force) {
 		nwsp = &nws[curcpu];
 		npwp = &nwsp->nws_work[proto];
-		NWS_LOCK(nwsp);
 		npwp->nw_dispatched++;
 		npwp->nw_handled++;
-		NWS_UNLOCK(nwsp);
 		np[proto].np_handler(m);
 		error = 0;
 		goto out_unlock;