Merge tag 'zonefs-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...

[sfrench/cifs-2.6.git] / drivers / net / gtp.c

diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c
index 2129ae42c70304776409e2166ff680bfea3fdbf8..2b5357d94ff5683049510c71c932be05abe0f211 100644 (file)
--- a/drivers/net/gtp.c
+++ b/drivers/net/gtp.c
@@ -1903,26 +1903,26 @@ static int __init gtp_init(void)
 
        get_random_bytes(&gtp_h_initval, sizeof(gtp_h_initval));
 
-       err = rtnl_link_register(&gtp_link_ops);
+       err = register_pernet_subsys(&gtp_net_ops);
        if (err < 0)
                goto error_out;
 
-       err = register_pernet_subsys(&gtp_net_ops);
+       err = rtnl_link_register(&gtp_link_ops);
        if (err < 0)
-               goto unreg_rtnl_link;
+               goto unreg_pernet_subsys;
 
        err = genl_register_family(&gtp_genl_family);
        if (err < 0)
-               goto unreg_pernet_subsys;
+               goto unreg_rtnl_link;
 
        pr_info("GTP module loaded (pdp ctx size %zd bytes)\n",
                sizeof(struct pdp_ctx));
        return 0;
 
-unreg_pernet_subsys:
-       unregister_pernet_subsys(&gtp_net_ops);
 unreg_rtnl_link:
        rtnl_link_unregister(&gtp_link_ops);
+unreg_pernet_subsys:
+       unregister_pernet_subsys(&gtp_net_ops);
 error_out:
        pr_err("error loading GTP module loaded\n");
        return err;