From owner-svn-src-stable@FreeBSD.ORG  Wed Aug 26 19:50:28 2009
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 5C811106568C;
	Wed, 26 Aug 2009 19:50:28 +0000 (UTC)
	(envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4A2718FC24;
	Wed, 26 Aug 2009 19:50:28 +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 n7QJoRV4072095;
	Wed, 26 Aug 2009 19:50:27 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7QJoRta072093;
	Wed, 26 Aug 2009 19:50:27 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <200908261950.n7QJoRta072093@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 26 Aug 2009 19:50:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196562 - stable/6/sys/netinet
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: Wed, 26 Aug 2009 19:50:28 -0000

Author: peter
Date: Wed Aug 26 19:50:27 2009
New Revision: 196562
URL: http://svn.freebsd.org/changeset/base/196562

Log:
  MFC: r196410: fix timewait expiration code when ticks goes negative after
  24 days of uptime.

Modified:
  stable/6/sys/netinet/tcp_timer.c

Modified: stable/6/sys/netinet/tcp_timer.c
==============================================================================
--- stable/6/sys/netinet/tcp_timer.c	Wed Aug 26 19:45:17 2009	(r196561)
+++ stable/6/sys/netinet/tcp_timer.c	Wed Aug 26 19:50:27 2009	(r196562)
@@ -247,7 +247,7 @@ tcp_timer_2msl_tw(int reuse)
 	INP_INFO_WLOCK_ASSERT(&tcbinfo);
 	for (;;) {
 		tw = TAILQ_FIRST(&twq_2msl);
-		if (tw == NULL || (!reuse && tw->tw_time > ticks))
+		if (tw == NULL || (!reuse && (int)(tw->tw_time - ticks) > 0))
 			break;
 		INP_LOCK(tw->tw_inpcb);
 		tcp_twclose(tw, reuse);