aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/igmp.c
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-01-21 20:32:38 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:10:20 -0500
commit7fee0ca23711ce1a6b13d3ab78915809a72a59ec (patch)
treee2df8e3997d996749b5169df59a56f3df67158c5 /net/ipv4/igmp.c
parentda0e28cb68a7e22b47c6ae1a5b12cb538c13c69f (diff)
[NETNS]: Add netns parameter to inetdev_by_index.
Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/igmp.c')
-rw-r--r--net/ipv4/igmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 016cfdb184f3..928bc3284554 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -1389,7 +1389,7 @@ static struct in_device * ip_mc_find_dev(struct ip_mreqn *imr)
1389 struct in_device *idev = NULL; 1389 struct in_device *idev = NULL;
1390 1390
1391 if (imr->imr_ifindex) { 1391 if (imr->imr_ifindex) {
1392 idev = inetdev_by_index(imr->imr_ifindex); 1392 idev = inetdev_by_index(&init_net, imr->imr_ifindex);
1393 if (idev) 1393 if (idev)
1394 __in_dev_put(idev); 1394 __in_dev_put(idev);
1395 return idev; 1395 return idev;
@@ -2222,7 +2222,7 @@ void ip_mc_drop_socket(struct sock *sk)
2222 struct in_device *in_dev; 2222 struct in_device *in_dev;
2223 inet->mc_list = iml->next; 2223 inet->mc_list = iml->next;
2224 2224
2225 in_dev = inetdev_by_index(iml->multi.imr_ifindex); 2225 in_dev = inetdev_by_index(&init_net, iml->multi.imr_ifindex);
2226 (void) ip_mc_leave_src(sk, iml, in_dev); 2226 (void) ip_mc_leave_src(sk, iml, in_dev);
2227 if (in_dev != NULL) { 2227 if (in_dev != NULL) {
2228 ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr); 2228 ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr);