33c33
< __FBSDID("$FreeBSD: head/sys/netinet/tcp_subr.c 205251 2010-03-17 18:28:27Z bz $");
---
> __FBSDID("$FreeBSD: head/sys/netinet/tcp_subr.c 207369 2010-04-29 11:52:42Z bz $");
114c114
< VNET_DEFINE(int, tcp_mssdflt);
---
> VNET_DEFINE(int, tcp_mssdflt) = TCP_MSS;
116c116
< VNET_DEFINE(int, tcp_v6mssdflt);
---
> VNET_DEFINE(int, tcp_v6mssdflt) = TCP6_MSS;
118,119d117
< VNET_DEFINE(int, tcp_minmss);
< VNET_DEFINE(int, tcp_do_rfc1323);
121,136d118
< static VNET_DEFINE(int, icmp_may_rst);
< static VNET_DEFINE(int, tcp_isn_reseed_interval);
< static VNET_DEFINE(int, tcp_inflight_enable);
< static VNET_DEFINE(int, tcp_inflight_rttthresh);
< static VNET_DEFINE(int, tcp_inflight_min);
< static VNET_DEFINE(int, tcp_inflight_max);
< static VNET_DEFINE(int, tcp_inflight_stab);
<
< #define V_icmp_may_rst VNET(icmp_may_rst)
< #define V_tcp_isn_reseed_interval VNET(tcp_isn_reseed_interval)
< #define V_tcp_inflight_enable VNET(tcp_inflight_enable)
< #define V_tcp_inflight_rttthresh VNET(tcp_inflight_rttthresh)
< #define V_tcp_inflight_min VNET(tcp_inflight_min)
< #define V_tcp_inflight_max VNET(tcp_inflight_max)
< #define V_tcp_inflight_stab VNET(tcp_inflight_stab)
<
196a179
> VNET_DEFINE(int, tcp_minmss) = TCP_MINMSS;
200a184
> VNET_DEFINE(int, tcp_do_rfc1323) = 1;
219a204,205
> static VNET_DEFINE(int, icmp_may_rst) = 1;
> #define V_icmp_may_rst VNET(icmp_may_rst)
223a210,211
> static VNET_DEFINE(int, tcp_isn_reseed_interval) = 0;
> #define V_tcp_isn_reseed_interval VNET(tcp_isn_reseed_interval)
235a224,225
> static VNET_DEFINE(int, tcp_inflight_enable) = 1;
> #define V_tcp_inflight_enable VNET(tcp_inflight_enable)
244a235,236
> static VNET_DEFINE(int, tcp_inflight_rttthresh);
> #define V_tcp_inflight_rttthresh VNET(tcp_inflight_rttthresh)
249a242,243
> static VNET_DEFINE(int, tcp_inflight_min) = 6144;
> #define V_tcp_inflight_min VNET(tcp_inflight_min)
253a248,249
> static VNET_DEFINE(int, tcp_inflight_max) = TCP_MAXWIN << TCP_MAX_WINSHIFT;
> #define V_tcp_inflight_max VNET(tcp_inflight_max)
257a254,255
> static VNET_DEFINE(int, tcp_inflight_stab) = 20;
> #define V_tcp_inflight_stab VNET(tcp_inflight_stab)
332,378d329
< V_blackhole = 0;
< V_tcp_delack_enabled = 1;
< V_drop_synfin = 0;
< V_tcp_do_rfc3042 = 1;
< V_tcp_do_rfc3390 = 1;
< V_tcp_do_ecn = 0;
< V_tcp_ecn_maxretries = 1;
< V_tcp_insecure_rst = 0;
< V_tcp_do_autorcvbuf = 1;
< V_tcp_autorcvbuf_inc = 16*1024;
< V_tcp_autorcvbuf_max = 256*1024;
< V_tcp_do_rfc3465 = 1;
< V_tcp_abc_l_var = 2;
<
< V_tcp_mssdflt = TCP_MSS;
< #ifdef INET6
< V_tcp_v6mssdflt = TCP6_MSS;
< #endif
< V_tcp_minmss = TCP_MINMSS;
< V_tcp_do_rfc1323 = 1;
< V_icmp_may_rst = 1;
< V_tcp_isn_reseed_interval = 0;
< V_tcp_inflight_enable = 1;
< V_tcp_inflight_min = 6144;
< V_tcp_inflight_max = TCP_MAXWIN << TCP_MAX_WINSHIFT;
< V_tcp_inflight_stab = 20;
<
< V_path_mtu_discovery = 1;
< V_ss_fltsz = 1;
< V_ss_fltsz_local = 4;
< V_tcp_do_newreno = 1;
< V_tcp_do_tso = 1;
< V_tcp_do_autosndbuf = 1;
< V_tcp_autosndbuf_inc = 8*1024;
< V_tcp_autosndbuf_max = 256*1024;
<
< V_nolocaltimewait = 0;
<
< V_tcp_do_sack = 1;
< V_tcp_sack_maxholes = 128;
< V_tcp_sack_globalmaxholes = 65536;
< V_tcp_sack_globalholes = 0;
<
< V_tcp_inflight_rttthresh = TCPTV_INFLIGHT_RTTTHRESH;
<
< TUNABLE_INT_FETCH("net.inet.tcp.sack.enable", &V_tcp_do_sack);
<
387a339,340
> V_tcp_inflight_rttthresh = TCPTV_INFLIGHT_RTTTHRESH;
>
393a347
>
397a352,353
>
> TUNABLE_INT_FETCH("net.inet.tcp.sack.enable", &V_tcp_do_sack);