diff options
| author | Yuchung Cheng <[email protected]> | 2014-05-12 03:22:10 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2014-05-13 21:53:02 +0000 |
| commit | 89278c9dc922272df921042aafa18311f3398c6c (patch) | |
| tree | 0138bbfdcd757b29f89a999d8f7c84260b68f505 /net/ipv4/tcp_output.c | |
| parent | tcp: move fastopen functions to tcp_fastopen.c (diff) | |
| download | kernel-89278c9dc922272df921042aafa18311f3398c6c.tar.gz kernel-89278c9dc922272df921042aafa18311f3398c6c.zip | |
tcp: simplify fast open cookie processing
Consolidate various cookie checking and generation code to simplify
the fast open processing. The main goal is to reduce code duplication
in tcp_v4_conn_request() for IPv6 support.
Removes two experimental sysctl flags TFO_SERVER_ALWAYS and
TFO_SERVER_COOKIE_NOT_CHKD used primarily for developmental debugging
purposes.
Signed-off-by: Yuchung Cheng <[email protected]>
Signed-off-by: Daniel Lee <[email protected]>
Signed-off-by: Jerry Chu <[email protected]>
Signed-off-by: Eric Dumazet <[email protected]>
Acked-by: Neal Cardwell <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 694711a140d4..b20fc02920f9 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -627,7 +627,7 @@ static unsigned int tcp_synack_options(struct sock *sk, if (unlikely(!ireq->tstamp_ok)) remaining -= TCPOLEN_SACKPERM_ALIGNED; } - if (foc != NULL) { + if (foc != NULL && foc->len >= 0) { u32 need = TCPOLEN_EXP_FASTOPEN_BASE + foc->len; need = (need + 3) & ~3U; /* Align to 32 bits */ if (remaining >= need) { |