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

Commit 72c1d3bd authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

ipv4: register igmp_notifier even when !CONFIG_PROC_FS 



We still need this notifier even when we don't config
PROC_FS.

It should be rare to have a kernel without PROC_FS,
so just for completeness.

Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c49fa016

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ struct packet_type; 
struct rtable;

struct sockaddr;



int igmp_mc_proc_init(void);

int igmp_mc_init(void);



/*

 *	Functions provided by ip.c

net/ipv4/igmp.c

+6 −2
Original line number Diff line number Diff line
@@ -2762,6 +2762,7 @@ static struct pernet_operations igmp_net_ops = { 
	.init = igmp_net_init,

	.exit = igmp_net_exit,

};

#endif



static int igmp_netdev_event(struct notifier_block *this,

			     unsigned long event, void *ptr)
@@ -2785,8 +2786,9 @@ static struct notifier_block igmp_notifier = { 
	.notifier_call = igmp_netdev_event,

};



int __init igmp_mc_proc_init(void)

int __init igmp_mc_init(void)

{

#if defined(CONFIG_PROC_FS)

	int err;



	err = register_pernet_subsys(&igmp_net_ops);
@@ -2800,5 +2802,7 @@ int __init igmp_mc_proc_init(void) 
reg_notif_fail:

	unregister_pernet_subsys(&igmp_net_ops);

	return err;

}

#else

	return register_netdevice_notifier(&igmp_notifier);

#endif

}

net/ipv4/ip_output.c

+2 −2
Original line number Diff line number Diff line
@@ -1553,7 +1553,7 @@ void __init ip_init(void) 
	ip_rt_init();

	inet_initpeers();



#if defined(CONFIG_IP_MULTICAST) && defined(CONFIG_PROC_FS)

	igmp_mc_proc_init();

#if defined(CONFIG_IP_MULTICAST)

	igmp_mc_init();

#endif

}