diff options
| author | truckman <truckman@FreeBSD.org> | 2016-06-20 19:00:47 +0000 |
|---|---|---|
| committer | truckman <truckman@FreeBSD.org> | 2016-06-20 19:00:47 +0000 |
| commit | 031a6dfccc0ce6febdebe2f7ebda37f1421672be (patch) | |
| tree | 59a69a97188c94a42154ae629061206aab4113a2 /sys | |
| parent | 25fbd815762f4ddb3da2c9e3e27efb7fa1b7c1bd (diff) | |
| download | FreeBSD-src-031a6dfccc0ce6febdebe2f7ebda37f1421672be.zip FreeBSD-src-031a6dfccc0ce6febdebe2f7ebda37f1421672be.tar.gz | |
MFC r300240
Change net.inet.tcp.ecn.enable sysctl mib from a binary off/on
control to a three way setting.
0 - Totally disable ECN. (no change)
1 - Enable ECN if incoming connections request it. Outgoing
connections will request ECN. (no change from present != 0 setting)
2 - Enable ECN if incoming connections request it. Outgoing
conections will not request ECN.
Change the default value of net.inet.tcp.ecn.enable from 0 to 2.
Linux version 2.4.20 and newer, Solaris, and Mac OS X 10.5 and newer have
similar capabilities. The actual values above match Linux, and the default
matches the current Linux default.
Reviewed by: eadler
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D6386
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/tcp_input.c | 2 | ||||
| -rw-r--r-- | sys/netinet/tcp_output.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 435383d..25762cb 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -184,7 +184,7 @@ SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, abc_l_var, CTLFLAG_RW, static SYSCTL_NODE(_net_inet_tcp, OID_AUTO, ecn, CTLFLAG_RW, 0, "TCP ECN"); -VNET_DEFINE(int, tcp_do_ecn) = 0; +VNET_DEFINE(int, tcp_do_ecn) = 2; SYSCTL_VNET_INT(_net_inet_tcp_ecn, OID_AUTO, enable, CTLFLAG_RW, &VNET_NAME(tcp_do_ecn), 0, "TCP ECN support"); diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 4c4a605..57332be 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1109,7 +1109,7 @@ send: * resend those bits a number of times as per * RFC 3168. */ - if (tp->t_state == TCPS_SYN_SENT && V_tcp_do_ecn) { + if (tp->t_state == TCPS_SYN_SENT && V_tcp_do_ecn == 1) { if (tp->t_rxtshift >= 1) { if (tp->t_rxtshift <= V_tcp_ecn_maxretries) flags |= TH_ECE|TH_CWR; |
