diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 09:00:57 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 09:00:57 -0700 |
| commit | ca364d8388602b5c0d607c5452774833cc1ad667 (patch) | |
| tree | 4c6aa0a71c89b813c73c112391005fc00e44841a /include/linux/tcp.h | |
| parent | 84fd7bdf1266ee6228319903af7e58702745024d (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
| download | linux-ca364d8388602b5c0d607c5452774833cc1ad667.tar.gz linux-ca364d8388602b5c0d607c5452774833cc1ad667.tar.bz2 linux-ca364d8388602b5c0d607c5452774833cc1ad667.zip | |
Merge 3.7-rc3 into tty-next
This merges the tty changes in 3.7-rc3 into tty-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/tcp.h')
| -rw-r--r-- | include/linux/tcp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 8a7fc4be2d75..60b7aac15e0e 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -191,7 +191,8 @@ struct tcp_sock { u8 do_early_retrans:1,/* Enable RFC5827 early-retransmit */ early_retrans_delayed:1, /* Delayed ER timer installed */ syn_data:1, /* SYN includes data */ - syn_fastopen:1; /* SYN includes Fast Open option */ + syn_fastopen:1, /* SYN includes Fast Open option */ + syn_data_acked:1;/* data in SYN is acked by SYN-ACK */ /* RTT measurement */ u32 srtt; /* smoothed round trip time << 3 */ |