]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
tcp: Fix warning on 64-bit.
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2009 06:12:04 +0000 (22:12 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2009 06:12:04 +0000 (22:12 -0800)
net/ipv4/tcp_output.c: In function ‘tcp_make_synack’:
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

index 2ac8beff4d77bec8938a23485847ebc75d71e700..c08e06d44428e776edec32cb2fa669b37fd87069 100644 (file)
@@ -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,