]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
syncookies: fix inclusion of tcp options in syn-ack
authorFlorian Westphal <fw@strlen.de>
Wed, 29 Oct 2008 07:28:12 +0000 (00:28 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 7 Nov 2008 03:05:41 +0000 (19:05 -0800)
commitf29062d0ec12ee3a58c67228dc829574b4ced378
tree3773a8a8c7d47dad112ac65c4999c90e5bf35778
parent052b0b637259e81fb17fbebd45db5098aef49c72
syncookies: fix inclusion of tcp options in syn-ack

[ Upstream commit 8b5f12d04b2e93842f3dda01f029842047bf3f81 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/ipv4/tcp_output.c