PERFORCE change 149931 for review
Marko Zec
zec at FreeBSD.org
Wed Sep 17 09:50:21 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=149931
Change 149931 by zec at 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 *));
More information about the p4-projects
mailing list