12 files changed, 23 insertions, 17 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index cf97d8a6326e..559fe9437e0b 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3719,7 +3719,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
         }
 
         down_write(&(bonding_rwsem));
-        slave_dev = dev_get_by_name(ifr->ifr_slave);
+        slave_dev = dev_get_by_name(&init_net, ifr->ifr_slave);
 
         dprintk("slave_dev=%p: \n", slave_dev);
 
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 60cccf2aa959..8289e27a360a 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -35,6 +35,7 @@
 #include <linux/ctype.h>
 #include <linux/inet.h>
 #include <linux/rtnetlink.h>
+#include <net/net_namespace.h>
 
 /* #define BONDING_DEBUG 1 */
 #include "bonding.h"
@@ -299,7 +300,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                 read_unlock_bh(&bond->lock);
                 printk(KERN_INFO DRV_NAME ": %s: Adding slave %s.\n",
                        bond->dev->name, ifname);
-                dev = dev_get_by_name(ifname);
+                dev = dev_get_by_name(&init_net, ifname);
                 if (!dev) {
                         printk(KERN_INFO DRV_NAME
                                ": %s: Interface %s does not exist!\n",
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index 102218c4a907..f1cc66dcbdfd 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -116,6 +116,7 @@
 #include <linux/init.h>
 #include <linux/timer.h>
 #include <linux/netdevice.h>
+#include <net/net_namespace.h>
 
 #include <linux/if.h>
 #include <linux/if_arp.h>
@@ -412,7 +413,7 @@ static int eql_enslave(struct net_device *master_dev, slaving_request_t __user *
         if (copy_from_user(&srq, srqp, sizeof (slaving_request_t)))
                 return -EFAULT;
 
-        slave_dev  = dev_get_by_name(srq.slave_name);
+        slave_dev  = dev_get_by_name(&init_net, srq.slave_name);
         if (slave_dev) {
                 if ((master_dev->flags & IFF_UP) == IFF_UP) {
                         /* slave is not a master & not already a slave: */
@@ -460,7 +461,7 @@ static int eql_emancipate(struct net_device *master_dev, slaving_request_t __use
         if (copy_from_user(&srq, srqp, sizeof (slaving_request_t)))
                 return -EFAULT;
 
-        slave_dev = dev_get_by_name(srq.slave_name);
+        slave_dev = dev_get_by_name(&init_net, srq.slave_name);
         ret = -EINVAL;
         if (slave_dev) {
                 spin_lock_bh(&eql->queue.lock);
@@ -493,7 +494,7 @@ static int eql_g_slave_cfg(struct net_device *dev, slave_config_t __user *scp)
         if (copy_from_user(&sc, scp, sizeof (slave_config_t)))
                 return -EFAULT;
 
-        slave_dev = dev_get_by_name(sc.slave_name);
+        slave_dev = dev_get_by_name(&init_net, sc.slave_name);
         if (!slave_dev)
                 return -ENODEV;
 
@@ -528,7 +529,7 @@ static int eql_s_slave_cfg(struct net_device *dev, slave_config_t __user *scp)
         if (copy_from_user(&sc, scp, sizeof (slave_config_t)))
                 return -EFAULT;
 
-        slave_dev = dev_get_by_name(sc.slave_name);
+        slave_dev = dev_get_by_name(&init_net, sc.slave_name);
         if (!slave_dev)
                 return -ENODEV;
 
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index f5c3598e59af..b06c6db4383a 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -34,6 +34,7 @@
 #include <linux/init.h>
 #include <linux/moduleparam.h>
 #include <net/pkt_sched.h>
+#include <net/net_namespace.h>
 
 #define TX_TIMEOUT  (2*HZ)
 
@@ -97,7 +98,7 @@ static void ri_tasklet(unsigned long dev)
                 stats->tx_packets++;
                 stats->tx_bytes +=skb->len;
 
-                skb->dev = __dev_get_by_index(skb->iif);
+                skb->dev = __dev_get_by_index(&init_net, skb->iif);
                 if (!skb->dev) {
                         dev_kfree_skb(skb);
                         stats->tx_dropped++;
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index dc74d006e01f..2de073da182c 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -376,7 +376,7 @@ static int macvlan_newlink(struct net_device *dev,
         if (!tb[IFLA_LINK])
                 return -EINVAL;
 
-        lowerdev = __dev_get_by_index(nla_get_u32(tb[IFLA_LINK]));
+        lowerdev = __dev_get_by_index(dev->nd_net, nla_get_u32(tb[IFLA_LINK]));
         if (lowerdev == NULL)
                 return -ENODEV;
 
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index c5c70e4b1d36..2f130e06b6dc 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -216,7 +216,7 @@ static inline struct pppox_sock *get_item_by_addr(struct sockaddr_pppox *sp)
         struct net_device *dev;
         int ifindex;
 
-        dev = dev_get_by_name(sp->sa_addr.pppoe.dev);
+        dev = dev_get_by_name(&init_net, sp->sa_addr.pppoe.dev);
         if(!dev)
                 return NULL;
         ifindex = dev->ifindex;
@@ -603,7 +603,7 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,
 
         /* Don't re-bind if sid==0 */
         if (sp->sa_addr.pppoe.sid != 0) {
-                dev = dev_get_by_name(sp->sa_addr.pppoe.dev);
+                dev = dev_get_by_name(&init_net, sp->sa_addr.pppoe.dev);
 
                 error = -ENODEV;
                 if (!dev)
diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c
index 4c3d98ff4cd4..3773b3858bd4 100644
--- a/drivers/net/shaper.c
+++ b/drivers/net/shaper.c
@@ -86,6 +86,7 @@
 
 #include <net/dst.h>
 #include <net/arp.h>
+#include <net/net_namespace.h>
 
 struct shaper_cb {
         unsigned long   shapeclock;             /* Time it should go out */
@@ -488,7 +489,7 @@ static int shaper_ioctl(struct net_device *dev,  struct ifreq *ifr, int cmd)
         {
                 case SHAPER_SET_DEV:
                 {
-                        struct net_device *them=__dev_get_by_name(ss->ss_name);
+                        struct net_device *them=__dev_get_by_name(&init_net, ss->ss_name);
                         if(them==NULL)
                                 return -ENODEV;
                         if(sh->dev)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 62b2b3005019..691d264fbb6f 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -62,6 +62,7 @@
 #include <linux/if_ether.h>
 #include <linux/if_tun.h>
 #include <linux/crc32.h>
+#include <net/net_namespace.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -475,7 +476,7 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)
                      !capable(CAP_NET_ADMIN))
                         return -EPERM;
         }
-        else if (__dev_get_by_name(ifr->ifr_name))
+        else if (__dev_get_by_name(&init_net, ifr->ifr_name))
                 return -EINVAL;
         else {
                 char *name;
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index ca1c6893b809..2c86a4459d8a 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -345,7 +345,7 @@ static int veth_newlink(struct net_device *dev,
         else
                 snprintf(ifname, IFNAMSIZ, DRV_NAME "%%d");
 
-        peer = rtnl_create_link(ifname, &veth_link_ops, tbp);
+        peer = rtnl_create_link(dev->nd_net, ifname, &veth_link_ops, tbp);
         if (IS_ERR(peer))
                 return PTR_ERR(peer);
 
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 61041d5186ac..bc12810157e0 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -361,7 +361,7 @@ static int dlci_add(struct dlci_add *dlci)
 
 
         /* validate slave device */
-        slave = dev_get_by_name(dlci->devname);
+        slave = dev_get_by_name(&init_net, dlci->devname);
         if (!slave)
                 return -ENODEV;
 
@@ -427,7 +427,7 @@ static int dlci_del(struct dlci_add *dlci)
         int                     err;
 
         /* validate slave device */
-        master = __dev_get_by_name(dlci->devname);
+        master = __dev_get_by_name(&init_net, dlci->devname);
         if (!master)
                 return(-ENODEV);
 
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 1cc18e787a65..8d7e01e8f56f 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -54,6 +54,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 
+#include <net/net_namespace.h>
 #include <net/arp.h>
 
 #include <asm/io.h>
@@ -1361,7 +1362,7 @@ sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd )
 
                 if (copy_from_user( slave_name, ifr->ifr_data, sizeof slave_name ))
                         return -EFAULT;
-                slave_dev = dev_get_by_name( slave_name );
+                slave_dev = dev_get_by_name(&init_net, slave_name );
                 if( !slave_dev  ||  !(slave_dev->flags & IFF_UP) ) {
                         printk( KERN_ERR "%s: trying to enslave non-active "
                                 "device %s\n", dev->name, slave_name );
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index edb214e8c744..904e548e6795 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -1972,7 +1972,7 @@ static struct net_device *get_strip_dev(struct strip *strip_info)
                       sizeof(zero_address))) {
                 struct net_device *dev;
                 read_lock_bh(&dev_base_lock);
-                for_each_netdev(dev) {
+                for_each_netdev(&init_net, dev) {
                         if (dev->type == strip_info->dev->type &&
                             !memcmp(dev->dev_addr,
                                     &strip_info->true_dev_addr,