diff options
| author | Daniel Lezcano <dlezcano@fr.ibm.com> | 2008-03-04 22:45:59 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-04 22:45:59 +0100 |
| commit | 606a2b4862d4be31fa55cad89871fe52a422d511 (patch) | |
| tree | 4968038a439ba1ff2a255ead01228fc81dec97ee /net/ipv6/sit.c | |
| parent | [NETNS][IPV6] route6 - create route6 proc files for the namespace (diff) | |
| download | linux-606a2b4862d4be31fa55cad89871fe52a422d511.tar.xz linux-606a2b4862d4be31fa55cad89871fe52a422d511.zip | |
[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/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 1656c003b989..68720aa63f96 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -339,11 +339,11 @@ out: skb_reset_network_header(skb2); /* Try to guess incoming interface */ - rt6i = rt6_lookup(&iph6->saddr, NULL, NULL, 0); + rt6i = rt6_lookup(&init_net, &iph6->saddr, NULL, NULL, 0); if (rt6i && rt6i->rt6i_dev) { skb2->dev = rt6i->rt6i_dev; - rt6i = rt6_lookup(&iph6->daddr, &iph6->saddr, NULL, 0); + rt6i = rt6_lookup(&init_net, &iph6->daddr, &iph6->saddr, NULL, 0); if (rt6i && rt6i->rt6i_dev && rt6i->rt6i_dev->type == ARPHRD_SIT) { struct ip_tunnel *t = netdev_priv(rt6i->rt6i_dev); |