svn commit: r292599 - head/sys/netinet

[Kristof Provost]

Thanks!

Kristof

> On 22 Dec 2015, at 14:41, Jonathan T. Looney <jtl at FreeBSD.org> wrote:
> 
> Author: jtl
> Date: Tue Dec 22 13:41:50 2015
> New Revision: 292599
> URL: https://svnweb.freebsd.org/changeset/base/292599
> 
> Log:
>  Fix a panic when launching VNETs after the commit of r292309.
> 
>  Differential Revision:	https://reviews.freebsd.org/D4645
>  Reviewed by:	rrs
>  Reported by:	kp
>  Tested by:	kp
>  Sponsored by:	Juniper Networks
> 
> Modified:
>  head/sys/netinet/tcp_subr.c
> 
> Modified: head/sys/netinet/tcp_subr.c
> ==============================================================================
> --- 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) != 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 = TCBHASHSIZE;
> 	TUNABLE_INT_FETCH(tcbhash_tuneable, &hashsize);
> 	if (hashsize == 0) {
> @@ -675,6 +671,10 @@ tcp_init(void)
> 	tcp_rexmit_slop = TCPTV_CPU_VAR;
> 	tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT;
> 	tcp_tcbhashsize = 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);
> 
> 	if (tcp_soreceive_stream) {
> #ifdef INET
>