projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
[linux-2.6-block.git]
/
net
/
ipv6
/
netfilter.c
diff --git
a/net/ipv6/netfilter.c
b/net/ipv6/netfilter.c
index 0b88c563279366cab4bd48e50f4fdad49f332c6d..834cea69fb53b1a081be1de8368f1b9cec8921dd 100644
(file)
--- a/
net/ipv6/netfilter.c
+++ b/
net/ipv6/netfilter.c
@@
-29,7
+29,7
@@
int ip6_route_me_harder(struct sk_buff *skb)
#ifdef CONFIG_XFRM
if (!(IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED) &&
xfrm_decode_session(skb, &fl, AF_INET6) == 0)
- if (xfrm_lookup(&skb->dst, &fl, skb->sk, 0))
+ if (xfrm_lookup(
net,
&skb->dst, &fl, skb->sk, 0))
return -1;
#endif