Commit 63134803 authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files

neighbour: populate neigh_parms on alloc before calling ndo_neigh_setup 



dev->ndo_neigh_setup() might need some of the values of neigh_parms, so
populate them before calling it.

Signed-off-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a849bb7

net/core/neighbour.c

+6 −4
Original line number Diff line number Diff line
@@ -1441,16 +1441,18 @@ struct neigh_parms *neigh_parms_alloc(struct net_device *dev, 
		atomic_set(&p->refcnt, 1);

		p->reachable_time =

				neigh_rand_reach_time(p->base_reachable_time);

		dev_hold(dev);

		p->dev = dev;

		write_pnet(&p->net, hold_net(net));

		p->sysctl_table = NULL;



		if (ops->ndo_neigh_setup && ops->ndo_neigh_setup(dev, p)) {

			release_net(net);

			dev_put(dev);

			kfree(p);

			return NULL;

		}



		dev_hold(dev);

		p->dev = dev;

		write_pnet(&p->net, hold_net(net));

		p->sysctl_table = NULL;

		write_lock_bh(&tbl->lock);

		p->next		= tbl->parms.next;

		tbl->parms.next = p;