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

ipv6: mcast: Remove mca_get(). 



Since commit 63ed8de4 ("mld: add mc_lock for protecting per-interface
mld data"), the newly allocated struct ifmcaddr6 cannot be removed until
inet6_dev->mc_lock is released, so mca_get() and mc_put() are unnecessary.

Let's remove the extra refcounting.

Note that mca_get() was only used in __ipv6_dev_mc_inc().

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


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

net/ipv6/mcast.c

+1 −8
Original line number Diff line number Diff line
@@ -867,11 +867,6 @@ static void mld_clear_report(struct inet6_dev *idev) 
	spin_unlock_bh(&idev->mc_report_lock);

}



static void mca_get(struct ifmcaddr6 *mc)

{

	refcount_inc(&mc->mca_refcnt);

}



static void ma_put(struct ifmcaddr6 *mc)

{

	if (refcount_dec_and_test(&mc->mca_refcnt)) {
@@ -988,13 +983,11 @@ static int __ipv6_dev_mc_inc(struct net_device *dev, 
	rcu_assign_pointer(mc->next, idev->mc_list);

	rcu_assign_pointer(idev->mc_list, mc);



	mca_get(mc);



	mld_del_delrec(idev, mc);

	igmp6_group_added(mc);

	inet6_ifmcaddr_notify(dev, mc, RTM_NEWMULTICAST);

	mutex_unlock(&idev->mc_lock);

	ma_put(mc);



	return 0;

}