Re: [net-next-2.6 PATCH v8 0/7] TCPCT part 1: cookie option exchange

[David Miller <davem@davemloft.net>]

From: William Allen Simpson <william.allen.simpson@gmail.com>
Date: Wed, 02 Dec 2009 23:04:23 -0500

> Initiator                            Responder
> =========                            =========
> <SYN>                          ->
> Cookie
>                                 <-   <SYN,ACK(SYN)>
>                                      Cookie
>                                      optional data

All applied, thanks.

I had to apply the following fix on top to cure a warning on 64-bit.

tcp: Fix warning on 64-bit.

net/ipv4/tcp_output.c: In function ^[$B!F^[(Btcp_make_synack^[$B!G^[(B:
net/ipv4/tcp_output.c:2488: warning: cast from pointer to integer of different size

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 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 2ac8bef..c08e06d 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2485,7 +2485,7 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
 
 			/* recommended */
 			*tail-- ^= ((th->dest << 16) | th->source);
-			*tail-- ^= (u32)cvp; /* per sockopt */
+			*tail-- ^= (u32)(unsigned long)cvp; /* per sockopt */
 
 			sha_transform((__u32 *)&xvp->cookie_bakery[0],
 				      (char *)mess,
-- 
1.6.5