]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
commit8b5f12d04b2e93842f3dda01f029842047bf3f81
treec539679c5dce56b95de9767a9aa90eff07193fa5
parentb700a98c70401c2a48e509b91b47f58a883806bc
syncookies: fix inclusion of tcp options in syn-ack

David Miller noticed that commit
33ad798c924b4a1afad3593f2796d465040aadd5 '(tcp: options clean up')
did not move the req->cookie_ts check.
This essentially disabled commit 4dfc2817025965a2fc78a18c50f540736a6b5c24
'[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