| Message ID | 546BF3EB.1080603@cn.fujitsu.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Nov 18, 2014 at 5:35 PM, Duan Jiong <duanj.fnst@cn.fujitsu.com> wrote: > > > 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> > --- > v2: add missing rtnl_unregister() Reviewed-by: Cong Wang <cwang@twopensource.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Duan Jiong <duanj.fnst@cn.fujitsu.com> Date: Wed, 19 Nov 2014 09:35:39 +0800 > 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> > --- > v2: add missing rtnl_unregister() Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 0171f08..1a01d79 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);
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> --- v2: add missing rtnl_unregister() net/ipv6/ip6mr.c | 4 ++++ 1 file changed, 4 insertions(+)