aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/route.c
diff options
context:
space:
mode:
authorDaniel Lezcano <dlezcano@fr.ibm.com>2008-03-04 16:45:59 -0500
committerDavid S. Miller <davem@davemloft.net>2008-03-04 16:45:59 -0500
commit606a2b4862d4be31fa55cad89871fe52a422d511 (patch)
tree4968038a439ba1ff2a255ead01228fc81dec97ee /net/ipv6/route.c
parentcdb1876192dbe680b3ac955717fdf7f863c1762d (diff)
[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/route.c')
-rw-r--r--net/ipv6/route.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 5d9d293156cd..d9d840ced1c6 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -553,8 +553,8 @@ out:
553 553
554} 554}
555 555
556struct rt6_info *rt6_lookup(struct in6_addr *daddr, struct in6_addr *saddr, 556struct rt6_info *rt6_lookup(struct net *net, struct in6_addr *daddr,
557 int oif, int strict) 557 struct in6_addr *saddr, int oif, int strict)
558{ 558{
559 struct flowi fl = { 559 struct flowi fl = {
560 .oif = oif, 560 .oif = oif,
@@ -572,7 +572,7 @@ struct rt6_info *rt6_lookup(struct in6_addr *daddr, struct in6_addr *saddr,
572 flags |= RT6_LOOKUP_F_HAS_SADDR; 572 flags |= RT6_LOOKUP_F_HAS_SADDR;
573 } 573 }
574 574
575 dst = fib6_rule_lookup(&init_net, &fl, flags, ip6_pol_route_lookup); 575 dst = fib6_rule_lookup(net, &fl, flags, ip6_pol_route_lookup);
576 if (dst->error == 0) 576 if (dst->error == 0)
577 return (struct rt6_info *) dst; 577 return (struct rt6_info *) dst;
578 578
@@ -1159,7 +1159,7 @@ int ip6_route_add(struct fib6_config *cfg)
1159 if (!(gwa_type&IPV6_ADDR_UNICAST)) 1159 if (!(gwa_type&IPV6_ADDR_UNICAST))
1160 goto out; 1160 goto out;
1161 1161
1162 grt = rt6_lookup(gw_addr, NULL, cfg->fc_ifindex, 1); 1162 grt = rt6_lookup(&init_net, gw_addr, NULL, cfg->fc_ifindex, 1);
1163 1163
1164 err = -EHOSTUNREACH; 1164 err = -EHOSTUNREACH;
1165 if (grt == NULL) 1165 if (grt == NULL)
@@ -1483,7 +1483,7 @@ void rt6_pmtu_discovery(struct in6_addr *daddr, struct in6_addr *saddr,
1483 struct rt6_info *rt, *nrt; 1483 struct rt6_info *rt, *nrt;
1484 int allfrag = 0; 1484 int allfrag = 0;
1485 1485
1486 rt = rt6_lookup(daddr, saddr, dev->ifindex, 0); 1486 rt = rt6_lookup(dev->nd_net, daddr, saddr, dev->ifindex, 0);
1487 if (rt == NULL) 1487 if (rt == NULL)
1488 return; 1488 return;
1489 1489