Merge branch 'nfs-server-stable' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / arch / s390 / appldata / appldata_net_sum.c

diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c
index 516b3ac9a9b5267dd644e08277d5177943900070..6c1815a47714389e0f6664722e7c3563907a930a 100644 (file)
--- a/arch/s390/appldata/appldata_net_sum.c
+++ b/arch/s390/appldata/appldata_net_sum.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel_stat.h>
 #include <linux/netdevice.h>
+#include <net/net_namespace.h>
 
 #include "appldata.h"
 
@@ -107,11 +108,8 @@ static void appldata_get_net_sum_data(void *data)
        tx_dropped = 0;
        collisions = 0;
        read_lock(&dev_base_lock);
-       for (dev = dev_base; dev != NULL; dev = dev->next) {
+       for_each_netdev(&init_net, dev) {
                stats = dev->get_stats(dev);
-               if (stats == NULL) {
-                       continue;
-               }
                rx_packets += stats->rx_packets;
                tx_packets += stats->tx_packets;
                rx_bytes   += stats->rx_bytes;