aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-01-28 17:41:19 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:08:07 -0500
commitb7c6ba6eb1234e35a74fb8ba8123232a7b1ba9e4 (patch)
tree672c08c95229a6ac242ab12a5195dceddb0f3127 /net/ipv6
parent4f84d82f7a623f8641af2574425c329431ff158f (diff)
[NETNS]: Consolidate kernel netlink socket destruction.
Create a specific helper for netlink kernel socket disposal. This just let the code look better and provides a ground for proper disposal inside a namespace. Signed-off-by: Denis V. Lunev <den@openvz.org> Tested-by: Alexey Dobriyan <adobriyan@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/netfilter/ip6_queue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index a20db0bb5a1f..56b4ea6d29ed 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -609,7 +609,7 @@ cleanup_sysctl:
609 proc_net_remove(&init_net, IPQ_PROC_FS_NAME); 609 proc_net_remove(&init_net, IPQ_PROC_FS_NAME);
610 610
611cleanup_ipqnl: 611cleanup_ipqnl:
612 sock_release(ipqnl->sk_socket); 612 netlink_kernel_release(ipqnl);
613 mutex_lock(&ipqnl_mutex); 613 mutex_lock(&ipqnl_mutex);
614 mutex_unlock(&ipqnl_mutex); 614 mutex_unlock(&ipqnl_mutex);
615 615
@@ -628,7 +628,7 @@ static void __exit ip6_queue_fini(void)
628 unregister_netdevice_notifier(&ipq_dev_notifier); 628 unregister_netdevice_notifier(&ipq_dev_notifier);
629 proc_net_remove(&init_net, IPQ_PROC_FS_NAME); 629 proc_net_remove(&init_net, IPQ_PROC_FS_NAME);
630 630
631 sock_release(ipqnl->sk_socket); 631 netlink_kernel_release(ipqnl);
632 mutex_lock(&ipqnl_mutex); 632 mutex_lock(&ipqnl_mutex);
633 mutex_unlock(&ipqnl_mutex); 633 mutex_unlock(&ipqnl_mutex);
634 634