From owner-svn-src-head@FreeBSD.ORG  Mon Jun  1 18:38:36 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B8051065674;
	Mon,  1 Jun 2009 18:38:36 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 49D5B8FC1A;
	Mon,  1 Jun 2009 18:38:36 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51Ica2A087616;
	Mon, 1 Jun 2009 18:38:36 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51Ica2i087615;
	Mon, 1 Jun 2009 18:38:36 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200906011838.n51Ica2i087615@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 1 Jun 2009 18:38:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193243 - head/sys/net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jun 2009 18:38:36 -0000

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;