diff options
| author |   Duan Jiong <duanj.fnst@cn.fujitsu.com> | 2014-11-19 09:35:39 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-11-19 16:56:17 -0500 |
| commit | ffb1388a364d135810337182d6800a0c7ee44f48 (patch) | |
| tree | 84886bfc3c910d2040274f4cd8cfca470f2bac64 /net/ipv6/ip6mr.c | |
| parent | Merge tag 'linux-can-fixes-for-3.18-20141118' of git://gitorious.org/linux-can/linux-can (diff) | |
| download | linux-dev-ffb1388a364d135810337182d6800a0c7ee44f48.tar.xz linux-dev-ffb1388a364d135810337182d6800a0c7ee44f48.zip | |
ipv6: delete protocol and unregister rtnetlink when cleanup
pim6_protocol was added when initiation, but it not deleted.
Similarly, unregister RTNL_FAMILY_IP6MR rtnetlink.
Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
Reviewed-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 0171f08325c3..1a01d79b8698 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1439,6 +1439,10 @@ reg_pernet_fail: void ip6_mr_cleanup(void) { + rtnl_unregister(RTNL_FAMILY_IP6MR, RTM_GETROUTE); +#ifdef CONFIG_IPV6_PIMSM_V2 + inet6_del_protocol(&pim6_protocol, IPPROTO_PIM); +#endif unregister_netdevice_notifier(&ip6_mr_notifier); unregister_pernet_subsys(&ip6mr_net_ops); kmem_cache_destroy(mrt_cachep); |