15 files changed, 34 insertions, 34 deletions

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index a11e7a5c1da4..3a683006d761 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -981,7 +981,7 @@ static int arp_req_set(struct arpreq *r, struct net_device * dev)
                 if (mask && mask != htonl(0xFFFFFFFF))
                         return -EINVAL;
                 if (!dev && (r->arp_flags & ATF_COM)) {
-                        dev = dev_getbyhwaddr(r->arp_ha.sa_family, r->arp_ha.sa_data);
+                        dev = dev_getbyhwaddr(&init_net, r->arp_ha.sa_family, r->arp_ha.sa_data);
                         if (!dev)
                                 return -ENODEV;
                 }
@@ -1169,7 +1169,7 @@ int arp_ioctl(unsigned int cmd, void __user *arg)
         rtnl_lock();
         if (r.arp_dev[0]) {
                 err = -ENODEV;
-                if ((dev = __dev_get_by_name(r.arp_dev)) == NULL)
+                if ((dev = __dev_get_by_name(&init_net, r.arp_dev)) == NULL)
                         goto out;
 
                 /* Mmmm... It is wrong... ARPHRD_NETROM==0 */
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index c5eb1a29a5cf..721b89b60963 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -420,7 +420,7 @@ struct in_device *inetdev_by_index(int ifindex)
         struct net_device *dev;
         struct in_device *in_dev = NULL;
         read_lock(&dev_base_lock);
-        dev = __dev_get_by_index(ifindex);
+        dev = __dev_get_by_index(&init_net, ifindex);
         if (dev)
                 in_dev = in_dev_get(dev);
         read_unlock(&dev_base_lock);
@@ -506,7 +506,7 @@ static struct in_ifaddr *rtm_to_ifaddr(struct nlmsghdr *nlh)
                 goto errout;
         }
 
-        dev = __dev_get_by_index(ifm->ifa_index);
+        dev = __dev_get_by_index(&init_net, ifm->ifa_index);
         if (dev == NULL) {
                 err = -ENODEV;
                 goto errout;
@@ -628,7 +628,7 @@ int devinet_ioctl(unsigned int cmd, void __user *arg)
                 *colon = 0;
 
 #ifdef CONFIG_KMOD
-        dev_load(ifr.ifr_name);
+        dev_load(&init_net, ifr.ifr_name);
 #endif
 
         switch (cmd) {
@@ -669,7 +669,7 @@ int devinet_ioctl(unsigned int cmd, void __user *arg)
         rtnl_lock();
 
         ret = -ENODEV;
-        if ((dev = __dev_get_by_name(ifr.ifr_name)) == NULL)
+        if ((dev = __dev_get_by_name(&init_net, ifr.ifr_name)) == NULL)
                 goto done;
 
         if (colon)
@@ -909,7 +909,7 @@ no_in_dev:
          */
         read_lock(&dev_base_lock);
         rcu_read_lock();
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 if ((in_dev = __in_dev_get_rcu(dev)) == NULL)
                         continue;
 
@@ -988,7 +988,7 @@ __be32 inet_confirm_addr(const struct net_device *dev, __be32 dst, __be32 local,
 
         read_lock(&dev_base_lock);
         rcu_read_lock();
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 if ((in_dev = __in_dev_get_rcu(dev))) {
                         addr = confirm_addr_indev(in_dev, dst, local, scope);
                         if (addr)
@@ -1185,7 +1185,7 @@ static int inet_dump_ifaddr(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)
@@ -1244,7 +1244,7 @@ static void devinet_copy_dflt_conf(int i)
         struct net_device *dev;
 
         read_lock(&dev_base_lock);
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 struct in_device *in_dev;
                 rcu_read_lock();
                 in_dev = __in_dev_get_rcu(dev);
@@ -1333,7 +1333,7 @@ void inet_forward_change(void)
         IPV4_DEVCONF_DFLT(FORWARDING) = on;
 
         read_lock(&dev_base_lock);
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 struct in_device *in_dev;
                 rcu_read_lock();
                 in_dev = __in_dev_get_rcu(dev);
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 140bf7a8d877..df17aab193b4 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -334,7 +334,7 @@ static int rtentry_to_fib_config(int cmd, struct rtentry *rt,
                 colon = strchr(devname, ':');
                 if (colon)
                         *colon = 0;
-                dev = __dev_get_by_name(devname);
+                dev = __dev_get_by_name(&init_net, devname);
                 if (!dev)
                         return -ENODEV;
                 cfg->fc_oif = dev->ifindex;
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index c434119deb52..d30fb68d5f4e 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -533,7 +533,7 @@ static int fib_check_nh(struct fib_config *cfg, struct fib_info *fi,
                                 return -EINVAL;
                         if (inet_addr_type(nh->nh_gw) != RTN_UNICAST)
                                 return -EINVAL;
-                        if ((dev = __dev_get_by_index(nh->nh_oif)) == NULL)
+                        if ((dev = __dev_get_by_index(&init_net, nh->nh_oif)) == NULL)
                                 return -ENODEV;
                         if (!(dev->flags&IFF_UP))
                                 return -ENETDOWN;
@@ -799,7 +799,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg)
                 if (nhs != 1 || nh->nh_gw)
                         goto err_inval;
                 nh->nh_scope = RT_SCOPE_NOWHERE;
-                nh->nh_dev = dev_get_by_index(fi->fib_nh->nh_oif);
+                nh->nh_dev = dev_get_by_index(&init_net, fi->fib_nh->nh_oif);
                 err = -ENODEV;
                 if (nh->nh_dev == NULL)
                         goto failure;
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 02a899bec196..68a22670f597 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -517,7 +517,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
                 struct net_device *dev = NULL;
 
                 if (rt->fl.iif && sysctl_icmp_errors_use_inbound_ifaddr)
-                        dev = dev_get_by_index(rt->fl.iif);
+                        dev = dev_get_by_index(&init_net, rt->fl.iif);
 
                 if (dev) {
                         saddr = inet_select_addr(dev, 0, RT_SCOPE_LINK);
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index d78599a9dbd5..ad500a43b359 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -2292,7 +2292,7 @@ static inline struct ip_mc_list *igmp_mc_get_first(struct seq_file *seq)
         struct igmp_mc_iter_state *state = igmp_mc_seq_private(seq);
 
         state->in_dev = NULL;
-        for_each_netdev(state->dev) {
+        for_each_netdev(&init_net, state->dev) {
                 struct in_device *in_dev;
                 in_dev = in_dev_get(state->dev);
                 if (!in_dev)
@@ -2454,7 +2454,7 @@ static inline struct ip_sf_list *igmp_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 in_device *idev;
                 idev = in_dev_get(state->dev);
                 if (unlikely(idev == NULL))
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 0231bdcb2ab7..fabb86db763b 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -292,7 +292,7 @@ static void ip_expire(unsigned long arg)
         if ((qp->last_in&FIRST_IN) && qp->fragments != NULL) {
                 struct sk_buff *head = qp->fragments;
                 /* Send an ICMP "Fragment Reassembly Timeout" message. */
-                if ((head->dev = dev_get_by_index(qp->iif)) != NULL) {
+                if ((head->dev = dev_get_by_index(&init_net, qp->iif)) != NULL) {
                         icmp_send(head, ICMP_TIME_EXCEEDED, ICMP_EXC_FRAGTIME, 0);
                         dev_put(head->dev);
                 }
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 5c14ed63e56c..3106225c5e50 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -262,7 +262,7 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, int
                 int i;
                 for (i=1; i<100; i++) {
                         sprintf(name, "gre%d", i);
-                        if (__dev_get_by_name(name) == NULL)
+                        if (__dev_get_by_name(&init_net, name) == NULL)
                                 break;
                 }
                 if (i==100)
@@ -1196,7 +1196,7 @@ static int ipgre_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) {
                 hlen = tdev->hard_header_len;
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 6b420aedcdcf..b2b3053dfef7 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -602,7 +602,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                                 dev_put(dev);
                         }
                 } else
-                        dev = __dev_get_by_index(mreq.imr_ifindex);
+                        dev = __dev_get_by_index(&init_net, mreq.imr_ifindex);
 
 
                 err = -EADDRNOTAVAIL;
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 08ff623371f0..4303851749f6 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -193,7 +193,7 @@ static int __init ic_open_devs(void)
         if (dev_change_flags(&loopback_dev, loopback_dev.flags | IFF_UP) < 0)
                 printk(KERN_ERR "IP-Config: Failed to open %s\n", loopback_dev.name);
 
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 if (dev == &loopback_dev)
                         continue;
                 if (user_dev_name[0] ? !strcmp(dev->name, user_dev_name) :
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 396437242a1b..652bd86e33a3 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -225,7 +225,7 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int c
                 int i;
                 for (i=1; i<100; i++) {
                         sprintf(name, "tunl%d", i);
-                        if (__dev_get_by_name(name) == NULL)
+                        if (__dev_get_by_name(&init_net, name) == NULL)
                                 break;
                 }
                 if (i==100)
@@ -822,7 +822,7 @@ static int ipip_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);
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 036598835c63..b8b4b497fb57 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -125,7 +125,7 @@ struct net_device *ipmr_new_tunnel(struct vifctl *v)
 {
         struct net_device  *dev;
 
-        dev = __dev_get_by_name("tunl0");
+        dev = __dev_get_by_name(&init_net, "tunl0");
 
         if (dev) {
                 int err;
@@ -149,7 +149,7 @@ struct net_device *ipmr_new_tunnel(struct vifctl *v)
 
                 dev = NULL;
 
-                if (err == 0 && (dev = __dev_get_by_name(p.name)) != NULL) {
+                if (err == 0 && (dev = __dev_get_by_name(&init_net, p.name)) != NULL) {
                         dev->flags |= IFF_MULTICAST;
 
                         in_dev = __in_dev_get_rtnl(dev);
diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c
index 356f067484e3..1960747f354c 100644
--- a/net/ipv4/ipvs/ip_vs_sync.c
+++ b/net/ipv4/ipvs/ip_vs_sync.c
@@ -387,7 +387,7 @@ static int set_mcast_if(struct sock *sk, char *ifname)
         struct net_device *dev;
         struct inet_sock *inet = inet_sk(sk);
 
-        if ((dev = __dev_get_by_name(ifname)) == NULL)
+        if ((dev = __dev_get_by_name(&init_net, ifname)) == NULL)
                 return -ENODEV;
 
         if (sk->sk_bound_dev_if && dev->ifindex != sk->sk_bound_dev_if)
@@ -412,7 +412,7 @@ static int set_sync_mesg_maxlen(int sync_state)
         int num;
 
         if (sync_state == IP_VS_STATE_MASTER) {
-                if ((dev = __dev_get_by_name(ip_vs_master_mcast_ifn)) == NULL)
+                if ((dev = __dev_get_by_name(&init_net, ip_vs_master_mcast_ifn)) == NULL)
                         return -ENODEV;
 
                 num = (dev->mtu - sizeof(struct iphdr) -
@@ -423,7 +423,7 @@ static int set_sync_mesg_maxlen(int sync_state)
                 IP_VS_DBG(7, "setting the maximum length of sync sending "
                           "message %d.\n", sync_send_mesg_maxlen);
         } else if (sync_state == IP_VS_STATE_BACKUP) {
-                if ((dev = __dev_get_by_name(ip_vs_backup_mcast_ifn)) == NULL)
+                if ((dev = __dev_get_by_name(&init_net, ip_vs_backup_mcast_ifn)) == NULL)
                         return -ENODEV;
 
                 sync_recv_mesg_maxlen = dev->mtu -
@@ -451,7 +451,7 @@ join_mcast_group(struct sock *sk, struct in_addr *addr, char *ifname)
         memset(&mreq, 0, sizeof(mreq));
         memcpy(&mreq.imr_multiaddr, addr, sizeof(struct in_addr));
 
-        if ((dev = __dev_get_by_name(ifname)) == NULL)
+        if ((dev = __dev_get_by_name(&init_net, ifname)) == NULL)
                 return -ENODEV;
         if (sk->sk_bound_dev_if && dev->ifindex != sk->sk_bound_dev_if)
                 return -EINVAL;
@@ -472,7 +472,7 @@ static int bind_mcastif_addr(struct socket *sock, char *ifname)
         __be32 addr;
         struct sockaddr_in sin;
 
-        if ((dev = __dev_get_by_name(ifname)) == NULL)
+        if ((dev = __dev_get_by_name(&init_net, ifname)) == NULL)
                 return -ENODEV;
 
         addr = inet_select_addr(dev, 0, RT_SCOPE_UNIVERSE);
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 50fc9e009fe4..27f14e1ebd8b 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -401,7 +401,7 @@ checkentry(const char *tablename,
                                 return false;
                         }
 
-                        dev = dev_get_by_name(e->ip.iniface);
+                        dev = dev_get_by_name(&init_net, e->ip.iniface);
                         if (!dev) {
                                 printk(KERN_WARNING "CLUSTERIP: no such interface %s\n", e->ip.iniface);
                                 return false;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index efd2a9202d68..396c631166a4 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2213,7 +2213,7 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp)
 
 
         if (oldflp->oif) {
-                dev_out = dev_get_by_index(oldflp->oif);
+                dev_out = dev_get_by_index(&init_net, oldflp->oif);
                 err = -ENODEV;
                 if (dev_out == NULL)
                         goto out;
@@ -2592,7 +2592,7 @@ static int inet_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 == NULL) {
                         err = -ENODEV;
                         goto errout_free;