From owner-p4-projects@FreeBSD.ORG Wed Sep 17 09:50:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 787841065723; Wed, 17 Sep 2008 09:50:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9B661065674 for ; Wed, 17 Sep 2008 09:50:20 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9934B8FC1A for ; Wed, 17 Sep 2008 09:50:20 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8H9oKQn060013 for ; Wed, 17 Sep 2008 09:50:20 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8H9oKPh060005 for perforce@freebsd.org; Wed, 17 Sep 2008 09:50:20 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 17 Sep 2008 09:50:20 GMT Message-Id: <200809170950.m8H9oKPh060005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 149931 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Sep 2008 09:50:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=149931 Change 149931 by zec@zec_tpx32 on 2008/09/17 09:50:19 Unbreak kernel build. Affected files ... .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#33 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#49 edit .. //depot/projects/vimage/src/sys/netinet6/tcp6_var.h#3 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/tcp_input.c#33 (text+ko) ==== @@ -2978,6 +2978,7 @@ int isipv6; #endif KASSERT(tp != NULL, ("%s: tp == NULL", __func__)); + INIT_VNET_INET(tp->t_vnet); tcp_mss_update(tp, offer, &metrics); ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#49 (text+ko) ==== @@ -119,9 +119,9 @@ static int tcp_inflight_debug = 0; #ifndef VIMAGE -int tcp_mssdflt = TCP_MSS; +int tcp_mssdflt; #ifdef INET6 -int tcp_v6mssdflt = TCP6_MSS; +int tcp_v6mssdflt; #endif int tcp_minmss; int tcp_do_rfc1323; @@ -138,6 +138,7 @@ static int sysctl_net_inet_tcp_mss_check(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(TD_TO_VNET(curthread)); int error, new; new = V_tcp_mssdflt; @@ -151,14 +152,15 @@ return (error); } -SYSCTL_PROC(_net_inet_tcp, TCPCTL_MSSDFLT, mssdflt, CTLTYPE_INT|CTLFLAG_RW, - &tcp_mssdflt, 0, &sysctl_net_inet_tcp_mss_check, "I", - "Default TCP Maximum Segment Size"); +SYSCTL_V_PROC(V_NET, vnet_inet, _net_inet_tcp, TCPCTL_MSSDFLT, mssdflt, + CTLTYPE_INT|CTLFLAG_RW, tcp_mssdflt, 0, &sysctl_net_inet_tcp_mss_check, + "I", "Default TCP Maximum Segment Size"); #ifdef INET6 static int sysctl_net_inet_tcp_mss_v6_check(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(TD_TO_VNET(curthread)); int error, new; new = V_tcp_v6mssdflt; @@ -172,9 +174,10 @@ return (error); } -SYSCTL_PROC(_net_inet_tcp, TCPCTL_V6MSSDFLT, v6mssdflt, CTLTYPE_INT|CTLFLAG_RW, - &tcp_v6mssdflt, 0, &sysctl_net_inet_tcp_mss_v6_check, "I", - "Default TCP Maximum Segment Size for IPv6"); +SYSCTL_V_PROC(V_NET, vnet_inet, _net_inet_tcp, TCPCTL_V6MSSDFLT, v6mssdflt, + CTLTYPE_INT|CTLFLAG_RW, tcp_v6mssdflt, 0, + &sysctl_net_inet_tcp_mss_v6_check, "I", + "Default TCP Maximum Segment Size for IPv6"); #endif /* ==== //depot/projects/vimage/src/sys/netinet6/tcp6_var.h#3 (text+ko) ==== @@ -67,7 +67,9 @@ SYSCTL_DECL(_net_inet6_tcp6); #endif +#ifndef VIMAGE extern int tcp_v6mssdflt; /* XXX */ +#endif struct ip6_hdr; void tcp6_ctlinput __P((int, struct sockaddr *, void *));