about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2012-12-28 12:59:33 +0100
committerAndreas Jaeger <aj@suse.de>2012-12-28 12:59:33 +0100
commit4c4febf544c2cabdda06da023cb7c8a8e8ed4e77 (patch)
tree5f202d2c10581893405214542aab653c96aef700
parent91998e449e0ce758db55aecf2abc3ee510fcbc8f (diff)
downloadglibc-4c4febf544c2cabdda06da023cb7c8a8e8ed4e77.tar.gz
glibc-4c4febf544c2cabdda06da023cb7c8a8e8ed4e77.tar.xz
glibc-4c4febf544c2cabdda06da023cb7c8a8e8ed4e77.zip
Add new defines from Linux 3.7 to <netinet/tcp.h>
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/gnu/netinet/tcp.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index df6538e426..0426be3333 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-28  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/gnu/netinet/tcp.h (TCPI_OPT_SYN_DATA)
+	(TCPI_OPT_ECN_SEEN): Define.  Sync with Linux 3.7.
+
 2012-12-28  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	* 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 06e8414b58..278fc9d8a5 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