diff options
Diffstat (limited to 'net/bridge/br_ioctl.c')
-rw-r--r-- | net/bridge/br_ioctl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c index bb15e9e259b1..0655a5f07f58 100644 --- a/net/bridge/br_ioctl.c +++ b/net/bridge/br_ioctl.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/if_bridge.h> | 18 | #include <linux/if_bridge.h> |
19 | #include <linux/netdevice.h> | 19 | #include <linux/netdevice.h> |
20 | #include <linux/times.h> | 20 | #include <linux/times.h> |
21 | #include <net/net_namespace.h> | ||
21 | #include <asm/uaccess.h> | 22 | #include <asm/uaccess.h> |
22 | #include "br_private.h" | 23 | #include "br_private.h" |
23 | 24 | ||
@@ -27,7 +28,7 @@ static int get_bridge_ifindices(int *indices, int num) | |||
27 | struct net_device *dev; | 28 | struct net_device *dev; |
28 | int i = 0; | 29 | int i = 0; |
29 | 30 | ||
30 | for_each_netdev(dev) { | 31 | for_each_netdev(&init_net, dev) { |
31 | if (i >= num) | 32 | if (i >= num) |
32 | break; | 33 | break; |
33 | if (dev->priv_flags & IFF_EBRIDGE) | 34 | if (dev->priv_flags & IFF_EBRIDGE) |
@@ -90,7 +91,7 @@ static int add_del_if(struct net_bridge *br, int ifindex, int isadd) | |||
90 | if (!capable(CAP_NET_ADMIN)) | 91 | if (!capable(CAP_NET_ADMIN)) |
91 | return -EPERM; | 92 | return -EPERM; |
92 | 93 | ||
93 | dev = dev_get_by_index(ifindex); | 94 | dev = dev_get_by_index(&init_net, ifindex); |
94 | if (dev == NULL) | 95 | if (dev == NULL) |
95 | return -EINVAL; | 96 | return -EINVAL; |
96 | 97 | ||
@@ -364,7 +365,7 @@ static int old_deviceless(void __user *uarg) | |||
364 | return -EOPNOTSUPP; | 365 | return -EOPNOTSUPP; |
365 | } | 366 | } |
366 | 367 | ||
367 | int br_ioctl_deviceless_stub(unsigned int cmd, void __user *uarg) | 368 | int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd, void __user *uarg) |
368 | { | 369 | { |
369 | switch (cmd) { | 370 | switch (cmd) { |
370 | case SIOCGIFBR: | 371 | case SIOCGIFBR: |