diff options
author | Denis V. Lunev <den@openvz.org> | 2008-01-15 01:58:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:02:08 -0500 |
commit | 2db82b534bd52b349f1b2ab3e63aa40ca0e466ab (patch) | |
tree | c4302da806fb0d7031ddd1fd22c27e31bd5d5c65 /net/ipv4 | |
parent | a79878f00dad97d03a3e62a48b06227d55ae5fe4 (diff) |
[NETNS]: Make arp code network namespace consistent.
Some calls in the arp.c have network namespace as an argument. Getting
init_net inside these functions is simply inconsistent. Fix this.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/arp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index d12f31b0c107..357e8987146b 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c | |||
@@ -973,13 +973,13 @@ static int arp_req_set_public(struct net *net, struct arpreq *r, | |||
973 | if (mask && mask != htonl(0xFFFFFFFF)) | 973 | if (mask && mask != htonl(0xFFFFFFFF)) |
974 | return -EINVAL; | 974 | return -EINVAL; |
975 | if (!dev && (r->arp_flags & ATF_COM)) { | 975 | if (!dev && (r->arp_flags & ATF_COM)) { |
976 | dev = dev_getbyhwaddr(&init_net, r->arp_ha.sa_family, | 976 | dev = dev_getbyhwaddr(net, r->arp_ha.sa_family, |
977 | r->arp_ha.sa_data); | 977 | r->arp_ha.sa_data); |
978 | if (!dev) | 978 | if (!dev) |
979 | return -ENODEV; | 979 | return -ENODEV; |
980 | } | 980 | } |
981 | if (mask) { | 981 | if (mask) { |
982 | if (pneigh_lookup(&arp_tbl, &init_net, &ip, dev, 1) == NULL) | 982 | if (pneigh_lookup(&arp_tbl, net, &ip, dev, 1) == NULL) |
983 | return -ENOBUFS; | 983 | return -ENOBUFS; |
984 | return 0; | 984 | return 0; |
985 | } | 985 | } |
@@ -1088,7 +1088,7 @@ static int arp_req_delete_public(struct net *net, struct arpreq *r, | |||
1088 | __be32 mask = ((struct sockaddr_in *)&r->arp_netmask)->sin_addr.s_addr; | 1088 | __be32 mask = ((struct sockaddr_in *)&r->arp_netmask)->sin_addr.s_addr; |
1089 | 1089 | ||
1090 | if (mask == htonl(0xFFFFFFFF)) | 1090 | if (mask == htonl(0xFFFFFFFF)) |
1091 | return pneigh_delete(&arp_tbl, &init_net, &ip, dev); | 1091 | return pneigh_delete(&arp_tbl, net, &ip, dev); |
1092 | 1092 | ||
1093 | if (mask) | 1093 | if (mask) |
1094 | return -EINVAL; | 1094 | return -EINVAL; |
@@ -1166,7 +1166,7 @@ int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg) | |||
1166 | rtnl_lock(); | 1166 | rtnl_lock(); |
1167 | if (r.arp_dev[0]) { | 1167 | if (r.arp_dev[0]) { |
1168 | err = -ENODEV; | 1168 | err = -ENODEV; |
1169 | if ((dev = __dev_get_by_name(&init_net, r.arp_dev)) == NULL) | 1169 | if ((dev = __dev_get_by_name(net, r.arp_dev)) == NULL) |
1170 | goto out; | 1170 | goto out; |
1171 | 1171 | ||
1172 | /* Mmmm... It is wrong... ARPHRD_NETROM==0 */ | 1172 | /* Mmmm... It is wrong... ARPHRD_NETROM==0 */ |