Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43dc1701 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[ARP]: Minus one level of indentation in arp_req_set 



The ATF_PUBL requests are handled completely separate from
the others. Emphasize it with a separate function. This also
reduces the indentation level.

The same issue exists with the arp_delete_request, but
when I tried to make it in one patch diff produced completely
unreadable patch. So I split it into two, but they may be
done with one commit.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ff1cc20

net/ipv4/arp.c

+33 −25
Original line number Diff line number Diff line
@@ -952,18 +952,16 @@ static int arp_rcv(struct sk_buff *skb, struct net_device *dev, 
 *	Set (create) an ARP cache entry.

 */



static int arp_req_set(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;

	struct neighbour *neigh;

	int err;



	if (r->arp_flags&ATF_PUBL) {

	__be32 mask = ((struct sockaddr_in *)&r->arp_netmask)->sin_addr.s_addr;



	if (mask && mask != htonl(0xFFFFFFFF))

		return -EINVAL;

	if (!dev && (r->arp_flags & ATF_COM)) {

			dev = dev_getbyhwaddr(&init_net, r->arp_ha.sa_family, r->arp_ha.sa_data);

		dev = dev_getbyhwaddr(&init_net, r->arp_ha.sa_family,

				r->arp_ha.sa_data);

		if (!dev)

			return -ENODEV;

	}
@@ -983,6 +981,16 @@ static int arp_req_set(struct arpreq *r, struct net_device * dev) 
	return -ENXIO;

}



static int arp_req_set(struct arpreq *r, struct net_device * dev)

{

	__be32 ip;

	struct neighbour *neigh;

	int err;



	if (r->arp_flags & ATF_PUBL)

		return arp_req_set_public(r, dev);



	ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr;

	if (r->arp_flags & ATF_PERM)

		r->arp_flags |= ATF_COM;

	if (dev == NULL) {