From owner-svn-src-stable@FreeBSD.ORG  Sun Jul  4 12:22:18 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 766951065670;
	Sun,  4 Jul 2010 12:22:18 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 653C88FC21;
	Sun,  4 Jul 2010 12:22:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o64CMIfD027176;
	Sun, 4 Jul 2010 12:22:18 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o64CMIhx027174;
	Sun, 4 Jul 2010 12:22:18 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201007041222.o64CMIhx027174@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 4 Jul 2010 12:22:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209691 - stable/8/sys/netipsec
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jul 2010 12:22:18 -0000

Author: bz
Date: Sun Jul  4 12:22:17 2010
New Revision: 209691
URL: http://svn.freebsd.org/changeset/base/209691

Log:
  MFC r208508:
  
    MFp4 @178283:
  
    Improve IPsec flow distribution for better netisr parallelism.
    Instead of using the pointer that would have the last bits masked in a %
    statement in netisr_select_cpuid() to select the queue, use the SPI.
  
    Reviewed by:  rwatson

Modified:
  stable/8/sys/netipsec/ipsec_input.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/netipsec/ipsec_input.c
==============================================================================
--- stable/8/sys/netipsec/ipsec_input.c	Sun Jul  4 12:09:30 2010	(r209690)
+++ stable/8/sys/netipsec/ipsec_input.c	Sun Jul  4 12:22:17 2010	(r209691)
@@ -489,7 +489,7 @@ ipsec4_common_input_cb(struct mbuf *m, s
 	/*
 	 * Re-dispatch via software interrupt.
 	 */
-	if ((error = netisr_queue_src(NETISR_IP, (uintptr_t)sav, m))) {
+	if ((error = netisr_queue_src(NETISR_IP, (uintptr_t)sav->spi, m))) {
 		IPSEC_ISTAT(sproto, V_espstat.esps_qfull, V_ahstat.ahs_qfull,
 			    V_ipcompstat.ipcomps_qfull);