From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  1 07:54:27 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9DE28106566C;
	Mon,  1 Jun 2009 07:54:27 +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 8CE2A8FC0A;
	Mon,  1 Jun 2009 07:54:27 +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 n517sRi2068453;
	Mon, 1 Jun 2009 07:54:27 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n517sRo4068452;
	Mon, 1 Jun 2009 07:54:27 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200906010754.n517sRo4068452@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 1 Jun 2009 07:54:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193207 - projects/pnet/sys/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jun 2009 07:54:27 -0000

Author: rwatson
Date: Mon Jun  1 07:54:27 2009
New Revision: 193207
URL: http://svn.freebsd.org/changeset/base/193207

Log:
  When queueing a packet to a netisr thread and it's already being direct
  dispatched, suppress a wakeup -- the direct dispatching thread will
  generate it later.

Modified:
  projects/pnet/sys/net/netisr.c

Modified: projects/pnet/sys/net/netisr.c
==============================================================================
--- projects/pnet/sys/net/netisr.c	Mon Jun  1 07:48:27 2009	(r193206)
+++ projects/pnet/sys/net/netisr.c	Mon Jun  1 07:54:27 2009	(r193207)
@@ -776,7 +776,8 @@ netisr_queue_workstream(struct netisr_wo
 		if (npwp->nw_len > npwp->nw_watermark)
 			npwp->nw_watermark = npwp->nw_len;
 		nwsp->nws_pendingbits |= (1 << proto);
-		if (!(nwsp->nws_flags & (NWS_SCHEDULED | NWS_RUNNING))) {
+		if (!(nwsp->nws_flags & 
+		    (NWS_RUNNING | NWS_DISPATCHING | NWS_SCHEDULED))) {
 			nwsp->nws_flags |= NWS_SCHEDULED;
 			*dosignalp = 1;	/* Defer until unlocked. */
 		}