11 files changed, 38 insertions, 38 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);
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 21931c86e95b..e5c5aad44bb1 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -302,7 +302,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
                                         err = -EINVAL;
                                         goto out;
                                 }
-                                dev = dev_get_by_index(sk->sk_bound_dev_if);
+                                dev = dev_get_by_index(&init_net, sk->sk_bound_dev_if);
                                 if (!dev) {
                                         err = -ENODEV;
                                         goto out;
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index 0bd665498d06..d407992c1481 100644
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -112,10 +112,10 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, struct in6_addr *addr)
                 } else {
                         /* router, no matching interface: just pick one */
 
-                        dev = dev_get_by_flags(IFF_UP, IFF_UP|IFF_LOOPBACK);
+                        dev = dev_get_by_flags(&init_net, IFF_UP, IFF_UP|IFF_LOOPBACK);
                 }
         } else
-                dev = dev_get_by_index(ifindex);
+                dev = dev_get_by_index(&init_net, ifindex);
 
         if (dev == NULL) {
                 err = -ENODEV;
@@ -196,7 +196,7 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex, struct in6_addr *addr)
 
         write_unlock_bh(&ipv6_sk_ac_lock);
 
-        dev = dev_get_by_index(pac->acl_ifindex);
+        dev = dev_get_by_index(&init_net, pac->acl_ifindex);
         if (dev) {
                 ipv6_dev_ac_dec(dev, &pac->acl_addr);
                 dev_put(dev);
@@ -224,7 +224,7 @@ void ipv6_sock_ac_close(struct sock *sk)
                 if (pac->acl_ifindex != prev_index) {
                         if (dev)
                                 dev_put(dev);
-                        dev = dev_get_by_index(pac->acl_ifindex);
+                        dev = dev_get_by_index(&init_net, pac->acl_ifindex);
                         prev_index = pac->acl_ifindex;
                 }
                 if (dev)
@@ -429,7 +429,7 @@ int ipv6_chk_acast_addr(struct net_device *dev, struct in6_addr *addr)
         if (dev)
                 return ipv6_chk_acast_dev(dev, addr);
         read_lock(&dev_base_lock);
-        for_each_netdev(dev)
+        for_each_netdev(&init_net, dev)
                 if (ipv6_chk_acast_dev(dev, addr)) {
                         found = 1;
                         break;
@@ -453,7 +453,7 @@ static inline struct ifacaddr6 *ac6_get_first(struct seq_file *seq)
         struct ac6_iter_state *state = ac6_seq_private(seq);
 
         state->idev = NULL;
-        for_each_netdev(state->dev) {
+        for_each_netdev(&init_net, state->dev) {
                 struct inet6_dev *idev;
                 idev = in6_dev_get(state->dev);
                 if (!idev)
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index fe0f49024a0a..2ed689ac449e 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -544,7 +544,7 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl,
                                 if (!src_info->ipi6_ifindex)
                                         return -EINVAL;
                                 else {
-                                        dev = dev_get_by_index(src_info->ipi6_ifindex);
+                                        dev = dev_get_by_index(&init_net, src_info->ipi6_ifindex);
                                         if (!dev)
                                                 return -ENODEV;
                                 }
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index ca774d8e3be3..937625e577c1 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -235,7 +235,7 @@ static struct ip6_tnl *ip6_tnl_create(struct ip6_tnl_parm *p)
                 int i;
                 for (i = 1; i < IP6_TNL_MAX; i++) {
                         sprintf(name, "ip6tnl%d", i);
-                        if (__dev_get_by_name(name) == NULL)
+                        if (__dev_get_by_name(&init_net, name) == NULL)
                                 break;
                 }
                 if (i == IP6_TNL_MAX)
@@ -650,7 +650,7 @@ static inline int ip6_tnl_rcv_ctl(struct ip6_tnl *t)
                 struct net_device *ldev = NULL;
 
                 if (p->link)
-                        ldev = dev_get_by_index(p->link);
+                        ldev = dev_get_by_index(&init_net, p->link);
 
                 if ((ipv6_addr_is_multicast(&p->laddr) ||
                      likely(ipv6_chk_addr(&p->laddr, ldev, 0))) &&
@@ -786,7 +786,7 @@ static inline int ip6_tnl_xmit_ctl(struct ip6_tnl *t)
                 struct net_device *ldev = NULL;
 
                 if (p->link)
-                        ldev = dev_get_by_index(p->link);
+                        ldev = dev_get_by_index(&init_net, p->link);
 
                 if (unlikely(!ipv6_chk_addr(&p->laddr, ldev, 0)))
                         printk(KERN_WARNING
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 74254fccbcc8..eb330a44bacd 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -542,7 +542,7 @@ done:
                 if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != val)
                         goto e_inval;
 
-                if (__dev_get_by_index(val) == NULL) {
+                if (__dev_get_by_index(&init_net, val) == NULL) {
                         retv = -ENODEV;
                         break;
                 }
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index a41d5a0b50cc..e2ab43c989d4 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -215,7 +215,7 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, struct in6_addr *addr)
                         dst_release(&rt->u.dst);
                 }
         } else
-                dev = dev_get_by_index(ifindex);
+                dev = dev_get_by_index(&init_net, ifindex);
 
         if (dev == NULL) {
                 sock_kfree_s(sk, mc_lst, sizeof(*mc_lst));
@@ -266,7 +266,7 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex, struct in6_addr *addr)
                         *lnk = mc_lst->next;
                         write_unlock_bh(&ipv6_sk_mc_lock);
 
-                        if ((dev = dev_get_by_index(mc_lst->ifindex)) != NULL) {
+                        if ((dev = dev_get_by_index(&init_net, mc_lst->ifindex)) != NULL) {
                                 struct inet6_dev *idev = in6_dev_get(dev);
 
                                 (void) ip6_mc_leave_src(sk, mc_lst, idev);
@@ -301,7 +301,7 @@ static struct inet6_dev *ip6_mc_find_dev(struct in6_addr *group, int ifindex)
                         dst_release(&rt->u.dst);
                 }
         } else
-                dev = dev_get_by_index(ifindex);
+                dev = dev_get_by_index(&init_net, ifindex);
 
         if (!dev)
                 return NULL;
@@ -332,7 +332,7 @@ void ipv6_sock_mc_close(struct sock *sk)
                 np->ipv6_mc_list = mc_lst->next;
                 write_unlock_bh(&ipv6_sk_mc_lock);
 
-                dev = dev_get_by_index(mc_lst->ifindex);
+                dev = dev_get_by_index(&init_net, mc_lst->ifindex);
                 if (dev) {
                         struct inet6_dev *idev = in6_dev_get(dev);
 
@@ -2333,7 +2333,7 @@ static inline struct ifmcaddr6 *igmp6_mc_get_first(struct seq_file *seq)
         struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq);
 
         state->idev = NULL;
-        for_each_netdev(state->dev) {
+        for_each_netdev(&init_net, state->dev) {
                 struct inet6_dev *idev;
                 idev = in6_dev_get(state->dev);
                 if (!idev)
@@ -2477,7 +2477,7 @@ static inline struct ip6_sf_list *igmp6_mcf_get_first(struct seq_file *seq)
 
         state->idev = NULL;
         state->im = NULL;
-        for_each_netdev(state->dev) {
+        for_each_netdev(&init_net, state->dev) {
                 struct inet6_dev *idev;
                 idev = in6_dev_get(state->dev);
                 if (unlikely(idev == NULL))
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 38a3d21c2585..bdd0974e6775 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -283,7 +283,7 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
                         if (!sk->sk_bound_dev_if)
                                 goto out;
 
-                        dev = dev_get_by_index(sk->sk_bound_dev_if);
+                        dev = dev_get_by_index(&init_net, sk->sk_bound_dev_if);
                         if (!dev) {
                                 err = -ENODEV;
                                 goto out;
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index de795c04e34c..31601c993541 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -301,7 +301,7 @@ static void ip6_frag_expire(unsigned long data)
 
         fq_kill(fq);
 
-        dev = dev_get_by_index(fq->iif);
+        dev = dev_get_by_index(&init_net, fq->iif);
         if (!dev)
                 goto out;
 
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index f4f0c341e5c8..5bdd9d4010fe 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1130,7 +1130,7 @@ int ip6_route_add(struct fib6_config *cfg)
 #endif
         if (cfg->fc_ifindex) {
                 err = -ENODEV;
-                dev = dev_get_by_index(cfg->fc_ifindex);
+                dev = dev_get_by_index(&init_net, cfg->fc_ifindex);
                 if (!dev)
                         goto out;
                 idev = in6_dev_get(dev);
@@ -2265,7 +2265,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void
 
         if (iif) {
                 struct net_device *dev;
-                dev = __dev_get_by_index(iif);
+                dev = __dev_get_by_index(&init_net, iif);
                 if (!dev) {
                         err = -ENODEV;
                         goto errout;
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index eb20bb690abd..e79f419b1731 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -167,7 +167,7 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int
                 int i;
                 for (i=1; i<100; i++) {
                         sprintf(name, "sit%d", i);
-                        if (__dev_get_by_name(name) == NULL)
+                        if (__dev_get_by_name(&init_net, name) == NULL)
                                 break;
                 }
                 if (i==100)
@@ -761,7 +761,7 @@ static int ipip6_tunnel_init(struct net_device *dev)
         }
 
         if (!tdev && tunnel->parms.link)
-                tdev = __dev_get_by_index(tunnel->parms.link);
+                tdev = __dev_get_by_index(&init_net, tunnel->parms.link);
 
         if (tdev) {
                 dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr);