From: Andreas Jaeger Date: Fri, 28 Dec 2012 11:59:33 +0000 (+0100) Subject: Add new defines from Linux 3.7 to X-Git-Tag: glibc-2.18~926 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c4febf544c2cabdda06da023cb7c8a8e8ed4e77;p=thirdparty%2Fglibc.git Add new defines from Linux 3.7 to --- diff --git a/ChangeLog b/ChangeLog index df6538e4262..0426be33337 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-12-28 Andreas Jaeger + + * sysdeps/gnu/netinet/tcp.h (TCPI_OPT_SYN_DATA) + (TCPI_OPT_ECN_SEEN): Define. Sync with Linux 3.7. + 2012-12-28 Siddhesh Poyarekar * misc/sys/cdefs.h(__glibc_likely): Wrap __builtin_expect for diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h index 06e8414b58f..278fc9d8a58 100644 --- a/sysdeps/gnu/netinet/tcp.h +++ b/sysdeps/gnu/netinet/tcp.h @@ -173,7 +173,9 @@ enum # define TCPI_OPT_TIMESTAMPS 1 # define TCPI_OPT_SACK 2 # define TCPI_OPT_WSCALE 4 -# define TCPI_OPT_ECN 8 +# define TCPI_OPT_ECN 8 /* ECN was negociated at TCP session init */ +# define TCPI_OPT_ECN_SEEN 16 /* we received at least one packet with ECT */ +# define TCPI_OPT_SYN_DATA 32 /* SYN-ACK acked data in SYN sent or rcvd */ /* Values for tcpi_state. */ enum tcp_ca_state