diff options
Diffstat (limited to 'net/llc')
-rw-r--r-- | net/llc/af_llc.c | 4 | ||||
-rw-r--r-- | net/llc/llc_core.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index b48244156e75..49eacba824df 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c | |||
@@ -252,7 +252,7 @@ static int llc_ui_autobind(struct socket *sock, struct sockaddr_llc *addr) | |||
252 | if (!sock_flag(sk, SOCK_ZAPPED)) | 252 | if (!sock_flag(sk, SOCK_ZAPPED)) |
253 | goto out; | 253 | goto out; |
254 | rc = -ENODEV; | 254 | rc = -ENODEV; |
255 | llc->dev = dev_getfirstbyhwtype(addr->sllc_arphrd); | 255 | llc->dev = dev_getfirstbyhwtype(&init_net, addr->sllc_arphrd); |
256 | if (!llc->dev) | 256 | if (!llc->dev) |
257 | goto out; | 257 | goto out; |
258 | rc = -EUSERS; | 258 | rc = -EUSERS; |
@@ -303,7 +303,7 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen) | |||
303 | goto out; | 303 | goto out; |
304 | rc = -ENODEV; | 304 | rc = -ENODEV; |
305 | rtnl_lock(); | 305 | rtnl_lock(); |
306 | llc->dev = dev_getbyhwaddr(addr->sllc_arphrd, addr->sllc_mac); | 306 | llc->dev = dev_getbyhwaddr(&init_net, addr->sllc_arphrd, addr->sllc_mac); |
307 | rtnl_unlock(); | 307 | rtnl_unlock(); |
308 | if (!llc->dev) | 308 | if (!llc->dev) |
309 | goto out; | 309 | goto out; |
diff --git a/net/llc/llc_core.c b/net/llc/llc_core.c index d4b13a031fd5..248b5903bb13 100644 --- a/net/llc/llc_core.c +++ b/net/llc/llc_core.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
20 | #include <linux/string.h> | 20 | #include <linux/string.h> |
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
22 | #include <net/net_namespace.h> | ||
22 | #include <net/llc.h> | 23 | #include <net/llc.h> |
23 | 24 | ||
24 | LIST_HEAD(llc_sap_list); | 25 | LIST_HEAD(llc_sap_list); |
@@ -162,7 +163,7 @@ static int __init llc_init(void) | |||
162 | { | 163 | { |
163 | struct net_device *dev; | 164 | struct net_device *dev; |
164 | 165 | ||
165 | dev = first_net_device(); | 166 | dev = first_net_device(&init_net); |
166 | if (dev != NULL) | 167 | if (dev != NULL) |
167 | dev = next_net_device(dev); | 168 | dev = next_net_device(dev); |
168 | 169 | ||