cellular-infrastructure
/
osmo-gtp-kernel
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gtp: remove genl_register_family_with_ops for Linux < 3.13 

Remove the support for genl_register_family_with_ops for
Linux < 3.13. Also reorder the initialization to be more
in line with similar modules.

Signed-off-by: Andreas Schultz <aschultz@tpip.net>
Signed-off-by: Pablo Neira Ayuso <pablo@soleta.eu>
This commit is contained in:
Andreas Schultz 2015-11-16 16:06:43 +01:00 committed by Pablo Neira Ayuso
parent 7018f19683
commit 10855555e9
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtp.c
View File

@ -1321,35 +1321,30 @@ static int __init gtp_init(void)
get_random_bytes(&gtp_h_initval, sizeof(gtp_h_initval));
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
err = genl_register_family_with_ops(&gtp_genl_family, gtp_genl_ops);
if (err < 0)
return err;
#else
err = genl_register_family_with_ops(&gtp_genl_family,
gtp_genl_ops,
ARRAY_SIZE(gtp_genl_ops));
if (err < 0)
return err;
#endif
err = rtnl_link_register(&gtp_link_ops);
if (err < 0)
goto err1;
goto error_out;
err = genl_register_family_with_ops(&gtp_genl_family, gtp_genl_ops);
if (err < 0)
goto unreg_rtnl_link;
pr_info("GTP module loaded (pdp ctx size %Zd bytes)\n",
sizeof(struct pdp_ctx));
return 0;
err1:
unreg_rtnl_link:
rtnl_link_unregister(&gtp_link_ops);
error_out:
pr_err("error loading GTP module loaded\n");
genl_unregister_family(&gtp_genl_family);
return err;
}
late_initcall(gtp_init);
static void __exit gtp_fini(void)
{
rtnl_link_unregister(&gtp_link_ops);
genl_unregister_family(&gtp_genl_family);
rtnl_link_unregister(&gtp_link_ops);
pr_info("GTP module unloaded\n");
}