From 0a59d2b0b7b6d78a0be370eb506f1c284f0f7aad Mon Sep 17 00:00:00 2001
From: Xiaotian Feng <dfeng@redhat.com>
Date: Tue, 2 Nov 2010 16:11:05 +0000
Subject: [PATCH] --- yaml --- r: 221629 b: refs/heads/master c:
 41bb78b4b9adb21cf2c395b6b880aaae99c788b7 h: refs/heads/master i:   221627:
 37c4ccdce35af71905f54099ca4e7cd904b41d63 v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/route.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 38f0992a112f..06fbeba19615 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8200a59f24aeca379660f80658a8c0c343ca5c31
+refs/heads/master: 41bb78b4b9adb21cf2c395b6b880aaae99c788b7
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 25661f968f3f..fc328339be99 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -2741,6 +2741,7 @@ static void __net_exit ip6_route_net_exit(struct net *net)
 	kfree(net->ipv6.ip6_prohibit_entry);
 	kfree(net->ipv6.ip6_blk_hole_entry);
 #endif
+	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
 }
 
 static struct pernet_operations ip6_route_net_ops = {
@@ -2832,5 +2833,6 @@ void ip6_route_cleanup(void)
 	xfrm6_fini();
 	fib6_gc_cleanup();
 	unregister_pernet_subsys(&ip6_route_net_ops);
+	dst_entries_destroy(&ip6_dst_blackhole_ops);
 	kmem_cache_destroy(ip6_dst_ops_template.kmem_cachep);
 }