diff options
| author | Florian Westphal <fw@strlen.de> | 2017-12-04 19:19:18 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-04 13:35:36 -0500 |
| commit | a3fde2addd5f0218b64102005a237ef727b0dc30 (patch) | |
| tree | b6e0512543b626347841e96e8fba8b7cab64f8b4 /net/ipv6/ip6mr.c | |
| parent | 112d59c75c6a3adaa7e998fa63e9ccebb1d847a2 (diff) | |
| download | op-kernel-dev-a3fde2addd5f0218b64102005a237ef727b0dc30.zip op-kernel-dev-a3fde2addd5f0218b64102005a237ef727b0dc30.tar.gz | |
rtnetlink: ipv6: convert remaining users to rtnl_register_module
convert remaining users of rtnl_register to rtnl_register_module
and un-export rtnl_register.
Requested-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index a2e1a86..890f9bda 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 |
