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

Commit a79878f0 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[ARP]: Move inet_addr_type call after simple error checks in arp_contructor. 



The neighbour entry will be destroyed in the case of error, so it is
pointless to perform constly routing table lookup in this case.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a308da16

net/ipv4/arp.c

+2 −2
Original line number Diff line number Diff line
@@ -235,8 +235,6 @@ static int arp_constructor(struct neighbour *neigh) 
	struct in_device *in_dev;

	struct neigh_parms *parms;



	neigh->type = inet_addr_type(&init_net, addr);



	rcu_read_lock();

	in_dev = __in_dev_get_rcu(dev);

	if (in_dev == NULL) {
@@ -244,6 +242,8 @@ static int arp_constructor(struct neighbour *neigh) 
		return -EINVAL;

	}



	neigh->type = inet_addr_type(&init_net, addr);



	parms = in_dev->arp_parms;

	__neigh_parms_put(neigh->parms);

	neigh->parms = neigh_parms_clone(parms);