]> git.baikalelectronics.ru Git - kernel.git/commit
syncookies: fix inclusion of tcp options in syn-ack
authorFlorian Westphal <fw@strlen.de>
Mon, 27 Oct 2008 06:10:12 +0000 (23:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 27 Oct 2008 06:10:12 +0000 (23:10 -0700)
commitb8a761be6bb36e5314bc66d154ce4704f7e42e56
treec539679c5dce56b95de9767a9aa90eff07193fa5
parent65b1e0826fc88f0e1a28825017048bb3a73ac499
syncookies: fix inclusion of tcp options in syn-ack

David Miller noticed that commit
d3403d6e60b649b35011a240c09b01232d53f924 '(tcp: options clean up')
did not move the req->cookie_ts check.
This essentially disabled commit cad24b336d6a7299e5aae756258cf2b0e91c1bf4
'[Syncookies]: Add support for TCP options via timestamps.'.

This restores the original logic.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_output.c