---

yaml --- r: 172115 b: refs/heads/master c: f9a2e69 h: refs/heads/master i: 172113: 9ce46a6 172111: 9602b4e v: v3
git-mirror · Dec 3, 2009 · 597fdaf · 597fdaf
1 parent 5d62b70
commit 597fdaf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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,