From owner-svn-src-user@FreeBSD.ORG  Sat Jan 24 01:34:22 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9C669106564A;
	Sat, 24 Jan 2009 01:34:22 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B9568FC08;
	Sat, 24 Jan 2009 01:34:22 +0000 (UTC)
	(envelope-from kmacy@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 n0O1YMCo059477;
	Sat, 24 Jan 2009 01:34:22 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0O1YMCE059476;
	Sat, 24 Jan 2009 01:34:22 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200901240134.n0O1YMCE059476@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 24 Jan 2009 01:34:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187660 - user/kmacy/HEAD_fast_net/sys/netinet
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jan 2009 01:34:22 -0000

Author: kmacy
Date: Sat Jan 24 01:34:22 2009
New Revision: 187660
URL: http://svn.freebsd.org/changeset/base/187660

Log:
  mp_maxid may not be valid ensure that we re-schedule on
  cpuid less than or equal to the current one

Modified:
  user/kmacy/HEAD_fast_net/sys/netinet/tcp_timer.c

Modified: user/kmacy/HEAD_fast_net/sys/netinet/tcp_timer.c
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/netinet/tcp_timer.c	Sat Jan 24 00:14:34 2009	(r187659)
+++ user/kmacy/HEAD_fast_net/sys/netinet/tcp_timer.c	Sat Jan 24 01:34:22 2009	(r187660)
@@ -119,7 +119,7 @@ int	tcp_maxpersistidle;
 	/* max idle time in persist */
 int	tcp_maxidle;
 
-#define	INP_CPU(inp)	((inp)->inp_flowid % mp_maxid)
+#define	INP_CPU(inp)	min(curcpu, ((inp)->inp_flowid % mp_maxid))
 
 /*
  * Tcp protocol timeout routine called every 500 ms.