diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/s390/appldata/appldata_net_sum.c | 3 | ||||
-rw-r--r-- | arch/sparc64/solaris/ioctl.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c index 2180ac105b..6c1815a477 100644 --- a/arch/s390/appldata/appldata_net_sum.c +++ b/arch/s390/appldata/appldata_net_sum.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
17 | #include <linux/kernel_stat.h> | 17 | #include <linux/kernel_stat.h> |
18 | #include <linux/netdevice.h> | 18 | #include <linux/netdevice.h> |
19 | #include <net/net_namespace.h> | ||
19 | 20 | ||
20 | #include "appldata.h" | 21 | #include "appldata.h" |
21 | 22 | ||
@@ -107,7 +108,7 @@ static void appldata_get_net_sum_data(void *data) | |||
107 | tx_dropped = 0; | 108 | tx_dropped = 0; |
108 | collisions = 0; | 109 | collisions = 0; |
109 | read_lock(&dev_base_lock); | 110 | read_lock(&dev_base_lock); |
110 | for_each_netdev(dev) { | 111 | for_each_netdev(&init_net, dev) { |
111 | stats = dev->get_stats(dev); | 112 | stats = dev->get_stats(dev); |
112 | rx_packets += stats->rx_packets; | 113 | rx_packets += stats->rx_packets; |
113 | tx_packets += stats->tx_packets; | 114 | tx_packets += stats->tx_packets; |
diff --git a/arch/sparc64/solaris/ioctl.c b/arch/sparc64/solaris/ioctl.c index 18352a4986..8ad10a6d99 100644 --- a/arch/sparc64/solaris/ioctl.c +++ b/arch/sparc64/solaris/ioctl.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/compat.h> | 28 | #include <linux/compat.h> |
29 | 29 | ||
30 | #include <net/sock.h> | 30 | #include <net/sock.h> |
31 | #include <net/net_namespace.h> | ||
31 | 32 | ||
32 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
33 | #include <asm/termios.h> | 34 | #include <asm/termios.h> |
@@ -686,7 +687,7 @@ static inline int solaris_i(unsigned int fd, unsigned int cmd, u32 arg) | |||
686 | int i = 0; | 687 | int i = 0; |
687 | 688 | ||
688 | read_lock_bh(&dev_base_lock); | 689 | read_lock_bh(&dev_base_lock); |
689 | for_each_netdev(d) | 690 | for_each_netdev(&init_net, d) |
690 | i++; | 691 | i++; |
691 | read_unlock_bh(&dev_base_lock); | 692 | read_unlock_bh(&dev_base_lock); |
692 | 693 | ||