summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-03 07:12:04 +0100
committerDavid S. Miller <davem@davemloft.net>2009-12-03 07:12:04 +0100
commitf9a2e69e8bb77fe6c8e7da6380ebd4330c00a29e (patch)
treebce6a7a5ea458ab8444271270ba181ace643d0d9 /net/ipv4
parentnet: Teach vlans to cleanup as a pernet subsystem (diff)
downloadlinux-f9a2e69e8bb77fe6c8e7da6380ebd4330c00a29e.tar.xz
linux-f9a2e69e8bb77fe6c8e7da6380ebd4330c00a29e.zip
tcp: Fix warning on 64-bit.
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>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/tcp_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 2ac8beff4d77..c08e06d44428 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,