1 files changed, 14 insertions, 14 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 1a6783646520..ee55be975407 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -450,7 +450,7 @@ static void addrconf_forward_change(void)
         struct inet6_dev *idev;
 
         read_lock(&dev_base_lock);
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 rcu_read_lock();
                 idev = __in6_dev_get(dev);
                 if (idev) {
@@ -912,7 +912,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
         read_lock(&dev_base_lock);
         rcu_read_lock();
 
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 struct inet6_dev *idev;
                 struct inet6_ifaddr *ifa;
 
@@ -1858,7 +1858,7 @@ int addrconf_set_dstaddr(void __user *arg)
         if (copy_from_user(&ireq, arg, sizeof(struct in6_ifreq)))
                 goto err_exit;
 
-        dev = __dev_get_by_index(ireq.ifr6_ifindex);
+        dev = __dev_get_by_index(&init_net, ireq.ifr6_ifindex);
 
         err = -ENODEV;
         if (dev == NULL)
@@ -1889,7 +1889,7 @@ int addrconf_set_dstaddr(void __user *arg)
 
                 if (err == 0) {
                         err = -ENOBUFS;
-                        if ((dev = __dev_get_by_name(p.name)) == NULL)
+                        if ((dev = __dev_get_by_name(&init_net, p.name)) == NULL)
                                 goto err_exit;
                         err = dev_open(dev);
                 }
@@ -1919,7 +1919,7 @@ static int inet6_addr_add(int ifindex, struct in6_addr *pfx, int plen,
         if (!valid_lft || prefered_lft > valid_lft)
                 return -EINVAL;
 
-        if ((dev = __dev_get_by_index(ifindex)) == NULL)
+        if ((dev = __dev_get_by_index(&init_net, ifindex)) == NULL)
                 return -ENODEV;
 
         if ((idev = addrconf_add_dev(dev)) == NULL)
@@ -1970,7 +1970,7 @@ static int inet6_addr_del(int ifindex, struct in6_addr *pfx, int plen)
         struct inet6_dev *idev;
         struct net_device *dev;
 
-        if ((dev = __dev_get_by_index(ifindex)) == NULL)
+        if ((dev = __dev_get_by_index(&init_net, ifindex)) == NULL)
                 return -ENODEV;
 
         if ((idev = __in6_dev_get(dev)) == NULL)
@@ -2065,7 +2065,7 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)
                 return;
         }
 
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 struct in_device * in_dev = __in_dev_get_rtnl(dev);
                 if (in_dev && (dev->flags & IFF_UP)) {
                         struct in_ifaddr * ifa;
@@ -2221,12 +2221,12 @@ static void ip6_tnl_add_linklocal(struct inet6_dev *idev)
 
         /* first try to inherit the link-local address from the link device */
         if (idev->dev->iflink &&
-            (link_dev = __dev_get_by_index(idev->dev->iflink))) {
+            (link_dev = __dev_get_by_index(&init_net, idev->dev->iflink))) {
                 if (!ipv6_inherit_linklocal(idev, link_dev))
                         return;
         }
         /* then try to inherit it from any device */
-        for_each_netdev(link_dev) {
+        for_each_netdev(&init_net, link_dev) {
                 if (!ipv6_inherit_linklocal(idev, link_dev))
                         return;
         }
@@ -3084,7 +3084,7 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
                 valid_lft = INFINITY_LIFE_TIME;
         }
 
-        dev =  __dev_get_by_index(ifm->ifa_index);
+        dev =  __dev_get_by_index(&init_net, ifm->ifa_index);
         if (dev == NULL)
                 return -ENODEV;
 
@@ -3268,7 +3268,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
         s_ip_idx = ip_idx = cb->args[1];
 
         idx = 0;
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 if (idx < s_idx)
                         goto cont;
                 if (idx > s_idx)
@@ -3377,7 +3377,7 @@ static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr* nlh,
 
         ifm = nlmsg_data(nlh);
         if (ifm->ifa_index)
-                dev = __dev_get_by_index(ifm->ifa_index);
+                dev = __dev_get_by_index(&init_net, ifm->ifa_index);
 
         if ((ifa = ipv6_get_ifaddr(addr, dev, 1)) == NULL) {
                 err = -EADDRNOTAVAIL;
@@ -3589,7 +3589,7 @@ static int inet6_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
 
         read_lock(&dev_base_lock);
         idx = 0;
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 if (idx < s_idx)
                         goto cont;
                 if ((idev = in6_dev_get(dev)) == NULL)
@@ -4266,7 +4266,7 @@ void __exit addrconf_cleanup(void)
          *      clean dev list.
          */
 
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 if (__in6_dev_get(dev) == NULL)
                         continue;
                 addrconf_ifdown(dev, 1);