summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_gre.c
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-01-21 17:32:38 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:10:20 -0800
commit7fee0ca23711ce1a6b13d3ab78915809a72a59ec (patch)
treee2df8e3997d996749b5169df59a56f3df67158c5 /net/ipv4/ip_gre.c
parentda0e28cb68a7e22b47c6ae1a5b12cb538c13c69f (diff)
downloadlinux-7fee0ca23711ce1a6b13d3ab78915809a72a59ec.tar.gz
linux-7fee0ca23711ce1a6b13d3ab78915809a72a59ec.tar.bz2
linux-7fee0ca23711ce1a6b13d3ab78915809a72a59ec.zip
[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/ip_gre.c')
-rw-r--r--net/ipv4/ip_gre.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 8b81deb8ff1f..a74983d8c89c 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -1193,7 +1193,8 @@ static int ipgre_close(struct net_device *dev)
{
struct ip_tunnel *t = netdev_priv(dev);
if (ipv4_is_multicast(t->parms.iph.daddr) && t->mlink) {
- struct in_device *in_dev = inetdev_by_index(t->mlink);
+ struct in_device *in_dev;
+ in_dev = inetdev_by_index(dev->nd_net, t->mlink);
if (in_dev) {
ip_mc_dec_group(in_dev, t->parms.iph.daddr);
in_dev_put(in_dev);