git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
net
/
ipv6
/
syncookies.c
diff --git
a/net/ipv6/syncookies.c
b/net/ipv6/syncookies.c
index 676c80b5b14b8d13a518ce3a7d7b5f0c48208c5b..711175e0571f754539f5bc74975ebb5b83e1f54a 100644
(file)
--- a/
net/ipv6/syncookies.c
+++ b/
net/ipv6/syncookies.c
@@
-259,7
+259,7
@@
struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
if (final_p)
ipv6_addr_copy(&fl.fl6_dst, final_p);
- if ((xfrm_lookup(&dst, &fl, sk, 0)) < 0)
+ if ((xfrm_lookup(
sock_net(sk),
&dst, &fl, sk, 0)) < 0)
goto out_free;
}