iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ARP]: Consolidate some code in arp_req_set/delete_publc

Browse Source 
The PROXY_ARP is set on devconfigs in a similar way in
both calls.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2007-12-05 21:20:50 -08:00 committed by David S. Miller
parent 46479b4329
commit f8b33fdfaf
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
net/ipv4/arp.c
View File

@ -952,6 +952,19 @@ out_of_mem:
* Set (create) an ARP cache entry. * Set (create) an ARP cache entry.
*/ */
static int arp_req_set_proxy(struct net_device *dev, int on)
{
if (dev == NULL) {
IPV4_DEVCONF_ALL(PROXY_ARP) = on;
return 0;
}
if (__in_dev_get_rtnl(dev)) {
IN_DEV_CONF_SET(__in_dev_get_rtnl(dev), PROXY_ARP, on);
return 0;
}
return -ENXIO;
}
static int arp_req_set_public(struct arpreq *r, struct net_device *dev) static int arp_req_set_public(struct arpreq *r, struct net_device *dev)
{ {
__be32 ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr; __be32 ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr;
@ -970,15 +983,8 @@ static int arp_req_set_public(struct arpreq *r, struct net_device *dev)
return -ENOBUFS; return -ENOBUFS;
return 0; return 0;
} }
if (dev == NULL) {
IPV4_DEVCONF_ALL(PROXY_ARP) = 1; return arp_req_set_proxy(dev, 1);
return 0;
}
if (__in_dev_get_rtnl(dev)) {
IN_DEV_CONF_SET(__in_dev_get_rtnl(dev), PROXY_ARP, 1);
return 0;
}
return -ENXIO;
} }
static int arp_req_set(struct arpreq *r, struct net_device * dev) static int arp_req_set(struct arpreq *r, struct net_device * dev)
@ -1082,19 +1088,10 @@ static int arp_req_delete_public(struct arpreq *r, struct net_device *dev)
if (mask == htonl(0xFFFFFFFF)) if (mask == htonl(0xFFFFFFFF))
return pneigh_delete(&arp_tbl, &ip, dev); return pneigh_delete(&arp_tbl, &ip, dev);
if (mask == 0) { if (mask)
if (dev == NULL) { return -EINVAL;
IPV4_DEVCONF_ALL(PROXY_ARP) = 0;
return 0; return arp_req_set_proxy(dev, 0);
}
if (__in_dev_get_rtnl(dev)) {
IN_DEV_CONF_SET(__in_dev_get_rtnl(dev),
PROXY_ARP, 0);
return 0;
}
return -ENXIO;
}
return -EINVAL;
} }
static int arp_req_delete(struct arpreq *r, struct net_device * dev) static int arp_req_delete(struct arpreq *r, struct net_device * dev)