diff options
| author | Daniel Lezcano <dlezcano@fr.ibm.com> | 2008-03-04 13:45:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-04 13:45:59 -0800 |
| commit | 606a2b4862d4be31fa55cad89871fe52a422d511 (patch) | |
| tree | 4968038a439ba1ff2a255ead01228fc81dec97ee /net/ipv6/ip6_tunnel.c | |
| parent | cdb1876192dbe680b3ac955717fdf7f863c1762d (diff) | |
| download | op-kernel-dev-606a2b4862d4be31fa55cad89871fe52a422d511.zip op-kernel-dev-606a2b4862d4be31fa55cad89871fe52a422d511.tar.gz | |
[NETNS][IPV6] route6 - Pass the network namespace parameter to rt6_lookup
Add a network namespace parameter to rt6_lookup().
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 78f4388..4e19816 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -602,7 +602,7 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, skb_reset_network_header(skb2); /* Try to guess incoming interface */ - rt = rt6_lookup(&ipv6_hdr(skb2)->saddr, NULL, 0, 0); + rt = rt6_lookup(&init_net, &ipv6_hdr(skb2)->saddr, NULL, 0, 0); if (rt && rt->rt6i_dev) skb2->dev = rt->rt6i_dev; @@ -1112,7 +1112,7 @@ static void ip6_tnl_link_config(struct ip6_tnl *t) int strict = (ipv6_addr_type(&p->raddr) & (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL)); - struct rt6_info *rt = rt6_lookup(&p->raddr, &p->laddr, + struct rt6_info *rt = rt6_lookup(&init_net, &p->raddr, &p->laddr, p->link, strict); if (rt == NULL) |
