From 597fdaf8b990ca0d81b8caff266a6aad90b20ad0 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 2 Dec 2009 22:12:04 -0800 Subject: [PATCH] --- yaml --- r: 172115 b: refs/heads/master c: f9a2e69e8bb77fe6c8e7da6380ebd4330c00a29e h: refs/heads/master i: 172113: 9ce46a6141367d2324e2f5a18c8f3054d57addde 172111: 9602b4e8b92fee206e1e3eb05edd474356077d4b v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d7ebd723c0b3..7c9c65bfe4dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91e2ff3528ac90b9dbcb04b76488e8ad74e3d3d9 +refs/heads/master: f9a2e69e8bb77fe6c8e7da6380ebd4330c00a29e diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c index 2ac8beff4d77..c08e06d44428 100644 --- a/trunk/net/ipv4/tcp_output.c +++ b/trunk/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,