diff options
Diffstat (limited to 'net/bridge/br_netlink.c')
-rw-r--r-- | net/bridge/br_netlink.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 0fcf6f073064..53ab8e0cb518 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c | |||
@@ -12,6 +12,7 @@ | |||
12 | 12 | ||
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | #include <net/rtnetlink.h> | 14 | #include <net/rtnetlink.h> |
15 | #include <net/net_namespace.h> | ||
15 | #include "br_private.h" | 16 | #include "br_private.h" |
16 | 17 | ||
17 | static inline size_t br_nlmsg_size(void) | 18 | static inline size_t br_nlmsg_size(void) |
@@ -110,7 +111,7 @@ static int br_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb) | |||
110 | int idx; | 111 | int idx; |
111 | 112 | ||
112 | idx = 0; | 113 | idx = 0; |
113 | for_each_netdev(dev) { | 114 | for_each_netdev(&init_net, dev) { |
114 | /* not a bridge port */ | 115 | /* not a bridge port */ |
115 | if (dev->br_port == NULL || idx < cb->args[0]) | 116 | if (dev->br_port == NULL || idx < cb->args[0]) |
116 | goto skip; | 117 | goto skip; |
@@ -155,7 +156,7 @@ static int br_rtm_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | |||
155 | if (new_state > BR_STATE_BLOCKING) | 156 | if (new_state > BR_STATE_BLOCKING) |
156 | return -EINVAL; | 157 | return -EINVAL; |
157 | 158 | ||
158 | dev = __dev_get_by_index(ifm->ifi_index); | 159 | dev = __dev_get_by_index(&init_net, ifm->ifi_index); |
159 | if (!dev) | 160 | if (!dev) |
160 | return -ENODEV; | 161 | return -ENODEV; |
161 | 162 | ||