From 0e9d0ab9ec9929b65df00e3c63c948eef6e09f3d Mon Sep 17 00:00:00 2001
From: "Mutalik Desai, Suprasad" <suprasad.desai@intel.com>
Date: Fri, 2 Feb 2018 13:42:08 +0100
Subject: [PATCH] Merge pull request #239 in SW_PON/linux from
UGW_SW-20774-9710-11-12-multicast-porting-to-linux4.9 to xrx500
UGW_SW-20774-9710-11-12-multicast-porting-to-linux4.9
* commit 'fecf5cfbecff7d9e0b3ccc18cf116f9c68c656d0':
UGW_SW-20774 : Multicast fix for the FTP crash
---
net/mcast_helper/mcast_helper.c | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/net/mcast_helper/mcast_helper.c b/net/mcast_helper/mcast_helper.c
index 806a4334c..386dea5a4 100644
--- a/net/mcast_helper/mcast_helper.c
+++ b/net/mcast_helper/mcast_helper.c
@@ -1795,7 +1795,7 @@ const struct file_operations mcast_helper_seq_fops6 = {
*===========================================================================*/
-int __net_init mcast_helper_net_init(struct net *net)
+int mcast_helper_net_init(void)
{
struct proc_dir_entry *pde, *pde6;
@@ -1821,18 +1821,6 @@ out_mcast:
*description : function to remove mcast helper proc entry
*===========================================================================*/
-void __net_exit mcast_helper_net_exit(struct net *nt)
-{
- remove_proc_entry("mcast_helper", NULL);
- remove_proc_entry("mcast_helper6", NULL);
-}
-
-struct pernet_operations mcast_net_ops = {
- .init = mcast_helper_net_init,
- .exit = mcast_helper_net_exit,
-};
-
-
#ifdef CONFIG_SYSCTL
/**Functions to create a proc for ACL enable/disbale support **/
@@ -1948,7 +1936,7 @@ int __init mcast_helper_proc_init(void)
#endif
/*create_new_proc_entry();*/
- ret = register_pernet_subsys(&mcast_net_ops);
+ ret = mcast_helper_net_init();
return ret;
}
--
GitLab