summaryrefslogtreecommitdiff
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-06 13:11:46 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-06 13:11:46 +0400
commit90b4d60c6103105a634c495003c2ce931f075f63 (patch)
tree033f07fb175a5e0651f6a63fc0fe8e1860555ce5 /include/uapi/linux
parentbac91462e8a8609d7be02a2cbf5c2b406b04ed9f (diff)
parent8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff)
downloadlinux-90b4d60c6103105a634c495003c2ce931f075f63.tar.xz
Merge tag 'v3.7-rc3' into HEAD
Linux 3.7-rc3
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/tcp.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index c4b89a5cb7df..e962faa5ab0d 100644
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -130,6 +130,7 @@ enum {
#define TCPI_OPT_WSCALE 4
#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 */
enum tcp_ca_state {
TCP_CA_Open = 0,