2 files changed, 7 insertions, 3 deletions

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index e2c980dbe52d..452111fa4c52 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -216,9 +216,12 @@ static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
 {
         struct rt6_info *rt = (struct rt6_info *)dst;
         struct inet6_dev *idev = rt->rt6i_idev;
+        struct net_device *loopback_dev =
+                dev->nd_net->loopback_dev;
 
-        if (dev != init_net.loopback_dev && idev != NULL && idev->dev == dev) {
-                struct inet6_dev *loopback_idev = in6_dev_get(init_net.loopback_dev);
+        if (dev != loopback_dev && idev != NULL && idev->dev == dev) {
+                struct inet6_dev *loopback_idev =
+                        in6_dev_get(loopback_dev);
                 if (loopback_idev != NULL) {
                         rt->rt6i_idev = loopback_idev;
                         in6_dev_put(idev);
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index a31dd531e191..4d54951cea08 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -229,7 +229,8 @@ static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
 
         xdst = (struct xfrm_dst *)dst;
         if (xdst->u.rt6.rt6i_idev->dev == dev) {
-                struct inet6_dev *loopback_idev = in6_dev_get(init_net.loopback_dev);
+                struct inet6_dev *loopback_idev =
+                        in6_dev_get(dev->nd_net->loopback_dev);
                 BUG_ON(!loopback_idev);
 
                 do {