diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-25 20:35:18 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 20:35:18 -0500 |
commit | 52479b623d3d41df84c499325b6a8c7915413032 (patch) | |
tree | 196f303f296b53dc89a05954d9c03226a9b4158b /net/ipv6/ndisc.c | |
parent | cdcbca7c1f1946758cfacb69bc1c7eeaccb11e2d (diff) |
netns xfrm: lookup in netns
Pass netns to xfrm_lookup()/__xfrm_lookup(). For that pass netns
to flow_cache_lookup() and resolver callback.
Take it from socket or netdevice. Stub DECnet to init_net.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ndisc.c')
-rw-r--r-- | net/ipv6/ndisc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index af6705f03b5c..e4acc212345e 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -524,7 +524,7 @@ void ndisc_send_skb(struct sk_buff *skb, | |||
524 | return; | 524 | return; |
525 | } | 525 | } |
526 | 526 | ||
527 | err = xfrm_lookup(&dst, &fl, NULL, 0); | 527 | err = xfrm_lookup(net, &dst, &fl, NULL, 0); |
528 | if (err < 0) { | 528 | if (err < 0) { |
529 | kfree_skb(skb); | 529 | kfree_skb(skb); |
530 | return; | 530 | return; |
@@ -1524,7 +1524,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh, | |||
1524 | if (dst == NULL) | 1524 | if (dst == NULL) |
1525 | return; | 1525 | return; |
1526 | 1526 | ||
1527 | err = xfrm_lookup(&dst, &fl, NULL, 0); | 1527 | err = xfrm_lookup(net, &dst, &fl, NULL, 0); |
1528 | if (err) | 1528 | if (err) |
1529 | return; | 1529 | return; |
1530 | 1530 | ||