diff options
Diffstat (limited to 'net/ipv4/arp.c')
-rw-r--r-- | net/ipv4/arp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index a11e7a5c1da4..3a683006d761 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c | |||
@@ -981,7 +981,7 @@ static int arp_req_set(struct arpreq *r, struct net_device * dev) | |||
981 | if (mask && mask != htonl(0xFFFFFFFF)) | 981 | if (mask && mask != htonl(0xFFFFFFFF)) |
982 | return -EINVAL; | 982 | return -EINVAL; |
983 | if (!dev && (r->arp_flags & ATF_COM)) { | 983 | if (!dev && (r->arp_flags & ATF_COM)) { |
984 | dev = dev_getbyhwaddr(r->arp_ha.sa_family, r->arp_ha.sa_data); | 984 | dev = dev_getbyhwaddr(&init_net, r->arp_ha.sa_family, r->arp_ha.sa_data); |
985 | if (!dev) | 985 | if (!dev) |
986 | return -ENODEV; | 986 | return -ENODEV; |
987 | } | 987 | } |
@@ -1169,7 +1169,7 @@ int arp_ioctl(unsigned int cmd, void __user *arg) | |||
1169 | rtnl_lock(); | 1169 | rtnl_lock(); |
1170 | if (r.arp_dev[0]) { | 1170 | if (r.arp_dev[0]) { |
1171 | err = -ENODEV; | 1171 | err = -ENODEV; |
1172 | if ((dev = __dev_get_by_name(r.arp_dev)) == NULL) | 1172 | if ((dev = __dev_get_by_name(&init_net, r.arp_dev)) == NULL) |
1173 | goto out; | 1173 | goto out; |
1174 | 1174 | ||
1175 | /* Mmmm... It is wrong... ARPHRD_NETROM==0 */ | 1175 | /* Mmmm... It is wrong... ARPHRD_NETROM==0 */ |