aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/addrconf.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/addrconf.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/addrconf.c')
-rw-r--r--net/ipv6/addrconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index a1d872dacad6..9d894e8c7b72 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -753,7 +753,7 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)
753 struct rt6_info *rt; 753 struct rt6_info *rt;
754 754
755 ipv6_addr_prefix(&prefix, &ifp->addr, ifp->prefix_len); 755 ipv6_addr_prefix(&prefix, &ifp->addr, ifp->prefix_len);
756 rt = rt6_lookup(&prefix, NULL, ifp->idev->dev->ifindex, 1); 756 rt = rt6_lookup(&init_net, &prefix, NULL, ifp->idev->dev->ifindex, 1);
757 757
758 if (rt && ((rt->rt6i_flags & (RTF_GATEWAY | RTF_DEFAULT)) == 0)) { 758 if (rt && ((rt->rt6i_flags & (RTF_GATEWAY | RTF_DEFAULT)) == 0)) {
759 if (onlink == 0) { 759 if (onlink == 0) {
@@ -1700,7 +1700,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len)
1700 1700
1701 if (pinfo->onlink) { 1701 if (pinfo->onlink) {
1702 struct rt6_info *rt; 1702 struct rt6_info *rt;
1703 rt = rt6_lookup(&pinfo->prefix, NULL, dev->ifindex, 1); 1703 rt = rt6_lookup(&init_net, &pinfo->prefix, NULL, dev->ifindex, 1);
1704 1704
1705 if (rt && ((rt->rt6i_flags & (RTF_GATEWAY | RTF_DEFAULT)) == 0)) { 1705 if (rt && ((rt->rt6i_flags & (RTF_GATEWAY | RTF_DEFAULT)) == 0)) {
1706 if (rt->rt6i_flags&RTF_EXPIRES) { 1706 if (rt->rt6i_flags&RTF_EXPIRES) {