From: Duan Jiong <duanj.fnst@cn.fujitsu.com>
To: David Miller <davem@davemloft.net>
Cc: Cong Wang <cwang@twopensource.com>,
netdev <netdev@vger.kernel.org>, <eric.dumazet@gmail.com>
Subject: [PATCH v2] ipv6: delete protocol and unregister rtnetlink when cleanup
Date: Wed, 19 Nov 2014 09:35:39 +0800 [thread overview]
Message-ID: <546BF3EB.1080603@cn.fujitsu.com> (raw)
In-Reply-To: <CAHA+R7PNmac7KQpSK-vO9zVd3+926f6n_GpaGrbpBnSn98xiyQ@mail.gmail.com>
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(+)
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);
--
1.8.3.1
next prev parent reply other threads:[~2014-11-19 1:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-18 10:35 [PATCH] ipv6: delete protocol when cleanup Duan Jiong
2014-11-18 18:56 ` Cong Wang
2014-11-18 19:14 ` Eric Dumazet
2014-11-18 19:46 ` Cong Wang
2014-11-19 1:10 ` Duan Jiong
2014-11-19 1:35 ` Duan Jiong [this message]
2014-11-19 19:46 ` [PATCH v2] ipv6: delete protocol and unregister rtnetlink " Cong Wang
2014-11-19 21:55 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=546BF3EB.1080603@cn.fujitsu.com \
--to=duanj.fnst@cn.fujitsu.com \
--cc=cwang@twopensource.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.