From owner-svn-src-all@freebsd.org Tue Dec 22 13:50:02 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A81AFA4D34A; Tue, 22 Dec 2015 13:50:02 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from venus.codepro.be (venus.codepro.be [IPv6:2a01:4f8:162:1127::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.codepro.be", Issuer "Gandi Standard SSL CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 759211732; Tue, 22 Dec 2015 13:50:02 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from [IPv6:::1] (vega.codepro.be [IPv6:2a01:4f8:162:1127::3]) by venus.codepro.be (Postfix) with ESMTPSA id 850668CB3; Tue, 22 Dec 2015 14:49:59 +0100 (CET) Subject: Re: svn commit: r292599 - head/sys/netinet Mime-Version: 1.0 (Mac OS X Mail 9.2 \(3112\)) Content-Type: text/plain; charset=us-ascii From: Kristof Provost X-Checked-By-Nsa: Probably In-Reply-To: <201512221341.tBMDfp04019336@repo.freebsd.org> Date: Tue, 22 Dec 2015 14:50:02 +0100 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <3AB254FD-68BF-4395-8BAA-A0B5D51F1049@FreeBSD.org> References: <201512221341.tBMDfp04019336@repo.freebsd.org> To: "Jonathan T. Looney" X-Mailer: Apple Mail (2.3112) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2015 13:50:02 -0000 Thanks! Kristof > On 22 Dec 2015, at 14:41, Jonathan T. Looney wrote: >=20 > Author: jtl > Date: Tue Dec 22 13:41:50 2015 > New Revision: 292599 > URL: https://svnweb.freebsd.org/changeset/base/292599 >=20 > Log: > Fix a panic when launching VNETs after the commit of r292309. >=20 > Differential Revision: https://reviews.freebsd.org/D4645 > Reviewed by: rrs > Reported by: kp > Tested by: kp > Sponsored by: Juniper Networks >=20 > Modified: > head/sys/netinet/tcp_subr.c >=20 > Modified: head/sys/netinet/tcp_subr.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/netinet/tcp_subr.c Tue Dec 22 13:19:29 2015 = (r292598) > +++ head/sys/netinet/tcp_subr.c Tue Dec 22 13:41:50 2015 = (r292599) > @@ -593,10 +593,6 @@ tcp_init(void) > if (hhook_head_register(HHOOK_TYPE_TCP, HHOOK_TCP_EST_OUT, > &V_tcp_hhh[HHOOK_TCP_EST_OUT], = HHOOK_NOWAIT|HHOOK_HEADISINVNET) !=3D 0) > printf("%s: WARNING: unable to register helper hook\n", = __func__); > - /* Setup the tcp function block list */ > - TAILQ_INIT(&t_functions); > - rw_init_flags(&tcp_function_lock, "tcp_func_lock" , 0); > - register_tcp_functions(&tcp_def_funcblk, M_WAITOK); > hashsize =3D TCBHASHSIZE; > TUNABLE_INT_FETCH(tcbhash_tuneable, &hashsize); > if (hashsize =3D=3D 0) { > @@ -675,6 +671,10 @@ tcp_init(void) > tcp_rexmit_slop =3D TCPTV_CPU_VAR; > tcp_finwait2_timeout =3D TCPTV_FINWAIT2_TIMEOUT; > tcp_tcbhashsize =3D hashsize; > + /* Setup the tcp function block list */ > + TAILQ_INIT(&t_functions); > + rw_init_flags(&tcp_function_lock, "tcp_func_lock" , 0); > + register_tcp_functions(&tcp_def_funcblk, M_WAITOK); >=20 > if (tcp_soreceive_stream) { > #ifdef INET >=20