From owner-svn-src-stable-6@FreeBSD.ORG Tue Jun 30 15:23:16 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 9DEEF1065670;
Tue, 30 Jun 2009 15:23:16 +0000 (UTC)
(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 8B99D8FC1D;
Tue, 30 Jun 2009 15:23:16 +0000 (UTC)
(envelope-from attilio@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 n5UFNGwn084564;
Tue, 30 Jun 2009 15:23:16 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5UFNGmN084562;
Tue, 30 Jun 2009 15:23:16 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <200906301523.n5UFNGmN084562@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Tue, 30 Jun 2009 15:23:16 +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: r195196 - stable/6/sys/netinet
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Jun 2009 15:23:17 -0000
Author: attilio
Date: Tue Jun 30 15:23:16 2009
New Revision: 195196
URL: http://svn.freebsd.org/changeset/base/195196
Log:
If the table is empty we can end up with a NULL pointer.
Handle that case trying to free and re-allocate a new object for the
timerqueue, managing unallocations.
This is not an issue on 7 and further branches.
Submitted by: emaste
Sponsored by: Sandvine Incorporated
Reported by: Kyle Larose <no e-mail available>
Modified:
stable/6/sys/netinet/tcp_syncache.c
Modified: stable/6/sys/netinet/tcp_syncache.c
==============================================================================
--- stable/6/sys/netinet/tcp_syncache.c Tue Jun 30 14:34:06 2009 (r195195)
+++ stable/6/sys/netinet/tcp_syncache.c Tue Jun 30 15:23:16 2009 (r195196)
@@ -891,13 +891,15 @@ syncache_add(inc, to, th, sop, m)
/* NB: guarded by INP_INFO_WLOCK(&tcbinfo) */
for (i = SYNCACHE_MAXREXMTS; i >= 0; i--) {
sc = TAILQ_FIRST(&tcp_syncache.timerq[i]);
- if (sc != NULL)
+ if (sc != NULL) {
+ sc->sc_tp->ts_recent = ticks;
+ syncache_drop(sc, NULL);
+ tcpstat.tcps_sc_zonefail++;
+ sc = uma_zalloc(tcp_syncache.zone, M_NOWAIT |
+ M_ZERO);
break;
+ }
}
- sc->sc_tp->ts_recent = ticks;
- syncache_drop(sc, NULL);
- tcpstat.tcps_sc_zonefail++;
- sc = uma_zalloc(tcp_syncache.zone, M_NOWAIT | M_ZERO);
if (sc == NULL) {
if (ipopts)
(void) m_free(ipopts);
From owner-svn-src-stable-6@FreeBSD.ORG Thu Jul 2 00:44:21 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id ABBAE10656BB;
Thu, 2 Jul 2009 00:44:21 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 98B9C8FC1D;
Thu, 2 Jul 2009 00:44:21 +0000 (UTC)
(envelope-from delphij@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 n620iLAX028935;
Thu, 2 Jul 2009 00:44:21 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n620iLoD028934;
Thu, 2 Jul 2009 00:44:21 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200907020044.n620iLoD028934@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 2 Jul 2009 00:44:21 +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: r195276 - in stable/6/usr.sbin/sysinstall: . help
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jul 2009 00:44:22 -0000
Author: delphij
Date: Thu Jul 2 00:44:21 2009
New Revision: 195276
URL: http://svn.freebsd.org/changeset/base/195276
Log:
MFC r180208 (peter):
Set magic fbsd:nokeywords property that allows files to bypass
keyword expansion. (file-specific replacement for CVSROOT/exclude)
Modified:
stable/6/usr.sbin/sysinstall/ (props changed)
stable/6/usr.sbin/sysinstall/help/anonftp.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/configure.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/distributions.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/drives.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/fixit.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/html.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/media.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/network_device.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/options.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/partition.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/securelevel.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/shortcuts.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/slice.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/tcp.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/usage.hlp (props changed)
stable/6/usr.sbin/sysinstall/help/usermgmt.hlp (props changed)
From owner-svn-src-stable-6@FreeBSD.ORG Thu Jul 2 00:45:29 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 1BC69106567A;
Thu, 2 Jul 2009 00:45:29 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 0990A8FC18;
Thu, 2 Jul 2009 00:45:29 +0000 (UTC)
(envelope-from delphij@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 n620jSIn029010;
Thu, 2 Jul 2009 00:45:28 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n620jSi6029008;
Thu, 2 Jul 2009 00:45:28 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200907020045.n620jSi6029008@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 2 Jul 2009 00:45:28 +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: r195277 - in stable/6/usr.sbin/sysinstall: . help
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jul 2009 00:45:30 -0000
Author: delphij
Date: Thu Jul 2 00:45:28 2009
New Revision: 195277
URL: http://svn.freebsd.org/changeset/base/195277
Log:
MFC r195012:
Correct a typo (which you can use to in order -> which you can use in order
to).
PR: bin/136040
Submitted by: "Vikentii L. Karabin" <kvl tomsksoft com>
Modified:
stable/6/usr.sbin/sysinstall/ (props changed)
stable/6/usr.sbin/sysinstall/help/usage.hlp
Modified: stable/6/usr.sbin/sysinstall/help/usage.hlp
==============================================================================
--- stable/6/usr.sbin/sysinstall/help/usage.hlp Thu Jul 2 00:44:21 2009 (r195276)
+++ stable/6/usr.sbin/sysinstall/help/usage.hlp Thu Jul 2 00:45:28 2009 (r195277)
@@ -56,7 +56,7 @@ it's also useful when dealing with sub-s
that don't use menus and tend to scroll their output off the top of
the screen.
-FreeBSD also supports multiple "virtual consoles" which you can use to
+FreeBSD also supports multiple "virtual consoles" which you can use
in order to have several active sessions at once. Use ALT-F<n> to
switch between screens, where `F<n>' is the function key corresponding
to the screen you wish to see. By default, the system comes with 8