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

Commit 03d2f897 authored by Wang Chen's avatar Wang Chen Committed by YOSHIFUJI Hideaki
Browse files

ipv4: Do cleanup for ip_mr_init 



Same as ip6_mr_init(), make ip_mr_init() return errno if fails.
But do not do error handling in inet_init(), just print a msg.

Signed-off-by: default avatarWang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
parent 623d1a1a

include/linux/igmp.h

+0 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ extern int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf, 
extern int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,

		struct group_filter __user *optval, int __user *optlen);

extern int ip_mc_sf_allow(struct sock *sk, __be32 local, __be32 rmt, int dif);

extern void ip_mr_init(void);

extern void ip_mc_init_dev(struct in_device *);

extern void ip_mc_destroy_dev(struct in_device *);

extern void ip_mc_up(struct in_device *);

include/linux/mroute.h

+1 −2
Original line number Diff line number Diff line
@@ -147,8 +147,7 @@ static inline int ip_mroute_opt(int opt) 
extern int ip_mroute_setsockopt(struct sock *, int, char __user *, int);

extern int ip_mroute_getsockopt(struct sock *, int, char __user *, int __user *);

extern int ipmr_ioctl(struct sock *sk, int cmd, void __user *arg);

extern void ip_mr_init(void);



extern int ip_mr_init(void);



struct vif_device

{

net/ipv4/af_inet.c

+3 −2
Original line number Diff line number Diff line
@@ -1479,14 +1479,15 @@ static int __init inet_init(void) 
	 *	Initialise the multicast router

	 */

#if defined(CONFIG_IP_MROUTE)

	ip_mr_init();

	if (ip_mr_init())

		printk(KERN_CRIT "inet_init: Cannot init ipv4 mroute\n");

#endif

	/*

	 *	Initialise per-cpu ipv4 mibs

	 */



	if (init_ipv4_mibs())

		printk(KERN_CRIT "inet_init: Cannot init ipv4 mibs\n"); ;

		printk(KERN_CRIT "inet_init: Cannot init ipv4 mibs\n");



	ipv4_proc_init();

net/ipv4/ipmr.c

+24 −4
Original line number Diff line number Diff line
@@ -1878,16 +1878,36 @@ static struct net_protocol pim_protocol = { 
 *	Setup for IP multicast routing

 */



void __init ip_mr_init(void)

int __init ip_mr_init(void)

{

	int err;



	mrt_cachep = kmem_cache_create("ip_mrt_cache",

				       sizeof(struct mfc_cache),

				       0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,

				       NULL);

	if (!mrt_cachep)

		return -ENOMEM;



	setup_timer(&ipmr_expire_timer, ipmr_expire_process, 0);

	register_netdevice_notifier(&ip_mr_notifier);

	err = register_netdevice_notifier(&ip_mr_notifier);

	if (err)

		goto reg_notif_fail;

#ifdef CONFIG_PROC_FS

	proc_net_fops_create(&init_net, "ip_mr_vif", 0, &ipmr_vif_fops);

	proc_net_fops_create(&init_net, "ip_mr_cache", 0, &ipmr_mfc_fops);

	err = -ENOMEM;

	if (!proc_net_fops_create(&init_net, "ip_mr_vif", 0, &ipmr_vif_fops))

		goto proc_vif_fail;

	if (!proc_net_fops_create(&init_net, "ip_mr_cache", 0, &ipmr_mfc_fops))

		goto proc_cache_fail;

#endif

	return 0;

reg_notif_fail:

	kmem_cache_destroy(mrt_cachep);

#ifdef CONFIG_PROC_FS

proc_vif_fail:

	unregister_netdevice_notifier(&ip_mr_notifier);

proc_cache_fail:

	proc_net_remove(&init_net, "ip_mr_vif");

#endif

	return err;

}