Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Aug 2009 23:07:53 +0000 (UTC)
From:      Peter Wemm <peter@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r196414 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/xen/xenpci netinet
Message-ID:  <200908202307.n7KN7rPC002652@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: peter
Date: Thu Aug 20 23:07:53 2009
New Revision: 196414
URL: http://svn.freebsd.org/changeset/base/196414

Log:
  MFC rev 196410 - deal with 'ticks' going negative after 24 days of uptime
  with the default 1000hz clock in the timewait expiration code.
  
  Approved by:    re (kensmith)

Modified:
  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)
  stable/8/sys/netinet/tcp_timewait.c

Modified: stable/8/sys/netinet/tcp_timewait.c
==============================================================================
--- stable/8/sys/netinet/tcp_timewait.c	Thu Aug 20 23:04:21 2009	(r196413)
+++ stable/8/sys/netinet/tcp_timewait.c	Thu Aug 20 23:07:53 2009	(r196414)
@@ -603,7 +603,7 @@ tcp_tw_2msl_scan(int reuse)
 	INP_INFO_WLOCK_ASSERT(&V_tcbinfo);
 	for (;;) {
 		tw = TAILQ_FIRST(&V_twq_2msl);
-		if (tw == NULL || (!reuse && tw->tw_time > ticks))
+		if (tw == NULL || (!reuse && (tw->tw_time - ticks) > 0))
 			break;
 		INP_WLOCK(tw->tw_inpcb);
 		tcp_twclose(tw, reuse);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908202307.n7KN7rPC002652>