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

Commit 382ed724 authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

ipv6: add support for NETDEV_RESEND_IGMP event 



This patch adds support for NETDEV_RESEND_IGMP event similar
to how it works for IPv4.

Signed-off-by: default avatarVladislav Yasevich <vyasevic@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 25501837

include/net/ndisc.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -439,8 +439,10 @@ void ndisc_update(const struct net_device *dev, struct neighbour *neigh, 
 *	IGMP

 *	IGMP

 */

 */

int igmp6_init(void);

int igmp6_init(void);

int igmp6_late_init(void);





void igmp6_cleanup(void);

void igmp6_cleanup(void);

void igmp6_late_cleanup(void);





int igmp6_event_query(struct sk_buff *skb);

int igmp6_event_query(struct sk_buff *skb);

net/ipv6/af_inet6.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -1005,6 +1005,10 @@ static int __init inet6_init(void) 
	if (err)

	if (err)

		goto seg6_fail;

		goto seg6_fail;





	err = igmp6_late_init();

	if (err)

		goto igmp6_late_err;



#ifdef CONFIG_SYSCTL

#ifdef CONFIG_SYSCTL

	err = ipv6_sysctl_register();

	err = ipv6_sysctl_register();

	if (err)

	if (err)
@@ -1015,8 +1019,10 @@ static int __init inet6_init(void) 




#ifdef CONFIG_SYSCTL

#ifdef CONFIG_SYSCTL

sysctl_fail:

sysctl_fail:

	seg6_exit();

	igmp6_late_cleanup();

#endif

#endif

igmp6_late_err:

	seg6_exit();

seg6_fail:

seg6_fail:

	calipso_exit();

	calipso_exit();

calipso_fail:

calipso_fail:

net/ipv6/mcast.c

+48 −1
Original line number Original line Diff line number Diff line
@@ -2463,7 +2463,6 @@ static void mld_ifc_event(struct inet6_dev *idev) 
	mld_ifc_start_timer(idev, 1);

	mld_ifc_start_timer(idev, 1);

}

}







static void igmp6_timer_handler(unsigned long data)

static void igmp6_timer_handler(unsigned long data)

{

{

	struct ifmcaddr6 *ma = (struct ifmcaddr6 *) data;

	struct ifmcaddr6 *ma = (struct ifmcaddr6 *) data;
@@ -2599,6 +2598,44 @@ void ipv6_mc_destroy_dev(struct inet6_dev *idev) 
	write_unlock_bh(&idev->lock);

	write_unlock_bh(&idev->lock);

}

}





static void ipv6_mc_rejoin_groups(struct inet6_dev *idev)

{

	struct ifmcaddr6 *pmc;



	ASSERT_RTNL();



	if (mld_in_v1_mode(idev)) {

		read_lock_bh(&idev->lock);

		for (pmc = idev->mc_list; pmc; pmc = pmc->next)

			igmp6_join_group(pmc);

		read_unlock_bh(&idev->lock);

	} else

		mld_send_report(idev, NULL);

}



static int ipv6_mc_netdev_event(struct notifier_block *this,

				unsigned long event,

				void *ptr)

{

	struct net_device *dev = netdev_notifier_info_to_dev(ptr);

	struct inet6_dev *idev = __in6_dev_get(dev);



	switch (event) {

	case NETDEV_RESEND_IGMP:

		if (idev)

			ipv6_mc_rejoin_groups(idev);

		break;

	default:

		break;

	}



	return NOTIFY_DONE;

}



static struct notifier_block igmp6_netdev_notifier = {

	.notifier_call = ipv6_mc_netdev_event,

};



#ifdef CONFIG_PROC_FS

#ifdef CONFIG_PROC_FS

struct igmp6_mc_iter_state {

struct igmp6_mc_iter_state {

	struct seq_net_private p;

	struct seq_net_private p;
@@ -2970,7 +3007,17 @@ int __init igmp6_init(void) 
	return register_pernet_subsys(&igmp6_net_ops);

	return register_pernet_subsys(&igmp6_net_ops);

}

}





int __init igmp6_late_init(void)

{

	return register_netdevice_notifier(&igmp6_netdev_notifier);

}



void igmp6_cleanup(void)

void igmp6_cleanup(void)

{

{

	unregister_pernet_subsys(&igmp6_net_ops);

	unregister_pernet_subsys(&igmp6_net_ops);

}

}



void igmp6_late_cleanup(void)

{

	unregister_netdevice_notifier(&igmp6_netdev_notifier);

}