[PATCH net-next] rtnetlink: ipv6: convert remaining users to rtnl_register_module

[Florian Westphal]

convert remaining users of rtnl_register to rtnl_register_module
and un-export rtnl_register.

Requested-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Florian Westphal <f...@strlen.de>
---
 include/net/addrconf.h |  2 +-
 net/core/rtnetlink.c   |  1 -
 net/ipv6/addrconf.c    |  4 +++-
 net/ipv6/addrlabel.c   | 24 +++++++++++++++++-------
 net/ipv6/ip6mr.c       |  9 ++++++---
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index b623b65a79d1..c4185a7b0e90 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -180,7 +180,7 @@ static inline int addrconf_finite_timeout(unsigned long 
timeout)
  */
 int ipv6_addr_label_init(void);
 void ipv6_addr_label_cleanup(void);
-void ipv6_addr_label_rtnl_register(void);
+int ipv6_addr_label_rtnl_register(void);
 u32 ipv6_addr_label(struct net *net, const struct in6_addr *addr,
                    int type, int ifindex);
 
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index fb2d61df1e2f..eb2a88426d0c 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -265,7 +265,6 @@ void rtnl_register(int protocol, int msgtype,
                pr_err("Unable to register rtnetlink message handler, "
                       "protocol = %d, message type = %d\n", protocol, msgtype);
 }
-EXPORT_SYMBOL_GPL(rtnl_register);
 
 /**
  * rtnl_unregister - Unregister a rtnetlink message type
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index a5ad8425551a..ed06b1190f05 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -6627,7 +6627,9 @@ int __init addrconf_init(void)
                                   RTNL_FLAG_DOIT_UNLOCKED);
        if (err < 0)
                goto errout;
-       ipv6_addr_label_rtnl_register();
+       err = ipv6_addr_label_rtnl_register();
+       if (err < 0)
+               goto errout;
 
        return 0;
 errout:
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
index 303fcce5beef..1d6ced37ad71 100644
--- a/net/ipv6/addrlabel.c
+++ b/net/ipv6/addrlabel.c
@@ -547,12 +547,22 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct 
nlmsghdr *nlh,
        return err;
 }
 
-void __init ipv6_addr_label_rtnl_register(void)
+int __init ipv6_addr_label_rtnl_register(void)
 {
-       rtnl_register(PF_INET6, RTM_NEWADDRLABEL, ip6addrlbl_newdel,
-                     NULL, RTNL_FLAG_DOIT_UNLOCKED);
-       rtnl_register(PF_INET6, RTM_DELADDRLABEL, ip6addrlbl_newdel,
-                     NULL, RTNL_FLAG_DOIT_UNLOCKED);
-       rtnl_register(PF_INET6, RTM_GETADDRLABEL, ip6addrlbl_get,
-                     ip6addrlbl_dump, RTNL_FLAG_DOIT_UNLOCKED);
+       int ret;
+
+       ret = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_NEWADDRLABEL,
+                                  ip6addrlbl_newdel,
+                                  NULL, RTNL_FLAG_DOIT_UNLOCKED);
+       if (ret < 0)
+               return ret;
+       ret = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_DELADDRLABEL,
+                                  ip6addrlbl_newdel,
+                                  NULL, RTNL_FLAG_DOIT_UNLOCKED);
+       if (ret < 0)
+               return ret;
+       ret = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_GETADDRLABEL,
+                                  ip6addrlbl_get,
+                                  ip6addrlbl_dump, RTNL_FLAG_DOIT_UNLOCKED);
+       return ret;
 }
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index a2e1a864eb46..890f9bda06a4 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -1425,10 +1425,13 @@ int __init ip6_mr_init(void)
                goto add_proto_fail;
        }
 #endif
-       rtnl_register(RTNL_FAMILY_IP6MR, RTM_GETROUTE, NULL,
-                     ip6mr_rtm_dumproute, 0);
-       return 0;
+       err = rtnl_register_module(THIS_MODULE, RTNL_FAMILY_IP6MR, RTM_GETROUTE,
+                                  NULL, ip6mr_rtm_dumproute, 0);
+       if (err == 0)
+               return 0;
+
 #ifdef CONFIG_IPV6_PIMSM_V2
+       inet6_del_protocol(&pim6_protocol, IPPROTO_PIM);
 add_proto_fail:
        unregister_netdevice_notifier(&ip6_mr_notifier);
 #endif
-- 
2.13.6