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

ipv6: mcast: Use in6_dev_get() in ipv6_dev_mc_dec(). 



As well as __ipv6_dev_mc_inc(), all code in __ipv6_dev_mc_dec() are
protected by inet6_dev->mc_lock, and RTNL is not needed.

Let's use in6_dev_get() in ipv6_dev_mc_dec() and remove ASSERT_RTNL()
in __ipv6_dev_mc_dec().

Now, we can remove the RTNL comment above addrconf_leave_solict() too.

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


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

net/ipv6/addrconf.c

+1 −2
Original line number Diff line number Diff line
@@ -2241,12 +2241,11 @@ void addrconf_join_solict(struct net_device *dev, const struct in6_addr *addr) 
	ipv6_dev_mc_inc(dev, &maddr);

}



/* caller must hold RTNL */

void addrconf_leave_solict(struct inet6_dev *idev, const struct in6_addr *addr)

{

	struct in6_addr maddr;



	if (idev->dev->flags&(IFF_LOOPBACK|IFF_NOARP))

	if (READ_ONCE(idev->dev->flags) & (IFF_LOOPBACK | IFF_NOARP))

		return;



	addrconf_addr_solict_mult(addr, &maddr);

net/ipv6/mcast.c

+6 −8
Original line number Diff line number Diff line
@@ -1004,9 +1004,8 @@ int __ipv6_dev_mc_dec(struct inet6_dev *idev, const struct in6_addr *addr) 
{

	struct ifmcaddr6 *ma, __rcu **map;



	ASSERT_RTNL();



	mutex_lock(&idev->mc_lock);



	for (map = &idev->mc_list;

	     (ma = mc_dereference(*map, idev));

	     map = &ma->next) {
@@ -1037,13 +1036,12 @@ int ipv6_dev_mc_dec(struct net_device *dev, const struct in6_addr *addr) 
	struct inet6_dev *idev;

	int err;



	ASSERT_RTNL();



	idev = __in6_dev_get(dev);

	idev = in6_dev_get(dev);

	if (!idev)

		err = -ENODEV;

	else

		return -ENODEV;



	err = __ipv6_dev_mc_dec(idev, addr);

	in6_dev_put(idev);



	return err;

}