Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net: Fix percpu counters deadlock
  cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits: net
  drivers/net/usb: use USB API functions rather than constants
  cls_cgroup: clean up Kconfig
  cls_cgroup: clean up for cgroup part
  cls_cgroup: fix an oops when removing a cgroup
  EtherExpress16: fix printing timed out status
  mlx4_en: Added "set_ringparam" Ethtool interface implementation
  mlx4_en: Always allocate RX ring for each interrupt vector
  mlx4_en: Verify number of RX rings doesn't exceed MAX_RX_RINGS
  IPVS: Make "no destination available" message more consistent between schedulers
  net: KS8695: removed duplicated #include
  tun: Fix SIOCSIFHWADDR error.
  smsc911x: compile fix re netif_rx signature changes
  netns: foreach_netdev_safe is insufficient in default_device_exit
  net: make xfrm_statistics_seq_show use generic snmp_fold_field
  net: Fix more NAPI interface netdev argument drop fallout.
  net: Fix unused variable warnings in pasemi_mac.c and spider_net.c

1 files changed, 5 insertions, 3 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 446424027d24..09c66a449da6 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5066,13 +5066,14 @@ static struct pernet_operations __net_initdata netdev_net_ops = {
 
 static void __net_exit default_device_exit(struct net *net)
 {
-        struct net_device *dev, *next;
+        struct net_device *dev;
         /*
          * Push all migratable of the network devices back to the
          * initial network namespace
          */
         rtnl_lock();
-        for_each_netdev_safe(net, dev, next) {
+restart:
+        for_each_netdev(net, dev) {
                 int err;
                 char fb_name[IFNAMSIZ];
 
@@ -5083,7 +5084,7 @@ static void __net_exit default_device_exit(struct net *net)
                 /* Delete virtual devices */
                 if (dev->rtnl_link_ops && dev->rtnl_link_ops->dellink) {
                         dev->rtnl_link_ops->dellink(dev);
-                        continue;
+                        goto restart;
                 }
 
                 /* Push remaing network devices to init_net */
@@ -5094,6 +5095,7 @@ static void __net_exit default_device_exit(struct net *net)
                                 __func__, dev->name, err);
                         BUG();
                 }
+                goto restart;
         }
         rtnl_unlock();
 }