diff options
author | Daniel Lezcano <dlezcano@fr.ibm.com> | 2008-03-04 16:45:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-04 16:45:59 -0500 |
commit | 606a2b4862d4be31fa55cad89871fe52a422d511 (patch) | |
tree | 4968038a439ba1ff2a255ead01228fc81dec97ee /net/ipv6/mcast.c | |
parent | cdb1876192dbe680b3ac955717fdf7f863c1762d (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/mcast.c')
-rw-r--r-- | net/ipv6/mcast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index a373b8e7f241..197ca390a15d 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
@@ -208,7 +208,7 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, struct in6_addr *addr) | |||
208 | 208 | ||
209 | if (ifindex == 0) { | 209 | if (ifindex == 0) { |
210 | struct rt6_info *rt; | 210 | struct rt6_info *rt; |
211 | rt = rt6_lookup(addr, NULL, 0, 0); | 211 | rt = rt6_lookup(&init_net, addr, NULL, 0, 0); |
212 | if (rt) { | 212 | if (rt) { |
213 | dev = rt->rt6i_dev; | 213 | dev = rt->rt6i_dev; |
214 | dev_hold(dev); | 214 | dev_hold(dev); |
@@ -294,7 +294,7 @@ static struct inet6_dev *ip6_mc_find_dev(struct in6_addr *group, int ifindex) | |||
294 | if (ifindex == 0) { | 294 | if (ifindex == 0) { |
295 | struct rt6_info *rt; | 295 | struct rt6_info *rt; |
296 | 296 | ||
297 | rt = rt6_lookup(group, NULL, 0, 0); | 297 | rt = rt6_lookup(&init_net, group, NULL, 0, 0); |
298 | if (rt) { | 298 | if (rt) { |
299 | dev = rt->rt6i_dev; | 299 | dev = rt->rt6i_dev; |
300 | dev_hold(dev); | 300 | dev_hold(dev); |