[PATCH net-2.6.25 3/3][ARP] Consolidate some code in arp_req_set/delete_publc

[Pavel Emelyanov]

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

Signed-off-by: Pavel Emelyanov <[EMAIL PROTECTED]>

---

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 0a3f00c..ccd36fa 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -953,6 +953,19 @@ out_of_mem:
  *     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)
 {
        __be32 ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr;
@@ -971,15 +984,8 @@ static int arp_req_set_public(struct arpreq *r, struct 
net_device *dev)
                        return -ENOBUFS;
                return 0;
        }
-       if (dev == NULL) {
-               IPV4_DEVCONF_ALL(PROXY_ARP) = 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;
+
+       return arp_req_set_proxy(dev, 1);
 }
 
 static int arp_req_set(struct arpreq *r, struct net_device * dev)
@@ -1083,19 +1089,10 @@ static int arp_req_delete_public(struct arpreq *r, 
struct net_device *dev)
        if (mask == htonl(0xFFFFFFFF))
                return pneigh_delete(&arp_tbl, &ip, dev);
 
-       if (mask == 0) {
-               if (dev == NULL) {
-                       IPV4_DEVCONF_ALL(PROXY_ARP) = 0;
-                       return 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;
+       if (mask)
+               return -EINVAL;
+
+       return arp_req_set_proxy(dev, 0);
 }
 
 static int arp_req_delete(struct arpreq *r, struct net_device * dev)
-- 
1.5.3.4

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html