Commit fb60b74e authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

ipv6: ndisc: Remove __in6_dev_get() in pndisc_{constructor,destructor}(). 



ipv6_dev_mc_{inc,dec}() has the same check.

Let's remove __in6_dev_get() from pndisc_constructor() and
pndisc_destructor().

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20250702230210.3115355-2-kuni1840@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 01af0001

net/ipv6/ndisc.c

+7 −6
Original line number Diff line number Diff line
@@ -377,24 +377,25 @@ static int ndisc_constructor(struct neighbour *neigh) 
static int pndisc_constructor(struct pneigh_entry *n)

{

	struct in6_addr *addr = (struct in6_addr *)&n->key;

	struct in6_addr maddr;

	struct net_device *dev = n->dev;

	struct in6_addr maddr;



	if (!dev || !__in6_dev_get(dev))

	if (!dev)

		return -EINVAL;



	addrconf_addr_solict_mult(addr, &maddr);

	ipv6_dev_mc_inc(dev, &maddr);

	return 0;

	return ipv6_dev_mc_inc(dev, &maddr);

}



static void pndisc_destructor(struct pneigh_entry *n)

{

	struct in6_addr *addr = (struct in6_addr *)&n->key;

	struct in6_addr maddr;

	struct net_device *dev = n->dev;

	struct in6_addr maddr;



	if (!dev || !__in6_dev_get(dev))

	if (!dev)

		return;



	addrconf_addr_solict_mult(addr, &maddr);

	ipv6_dev_mc_dec(dev, &maddr);

}