From c04517e11ccca9529802f1b945951533657a9622 Mon Sep 17 00:00:00 2001
From: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
Date: Sun, 30 Dec 2007 23:27:10 -0800
Subject: [PATCH] --- yaml --- r: 78647 b: refs/heads/master c:
 a06b494b61de44617dd58612164bdde56fca7bfb h: refs/heads/master i:   78645:
 477cdd952df37e78b7097bc185273ccfe8723ee8   78643:
 ea951ef99472441c73dceacd29025191df564374   78639:
 930ad0a90af96be08c1ce81386f520948c055074 v: v3

---
 [refs]                   | 2 +-
 trunk/net/ipv6/ip6_fib.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d8b8b2484865..fe78fcdbbc80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f624357959001c9156ee7a475283fc6041f78e0e
+refs/heads/master: a06b494b61de44617dd58612164bdde56fca7bfb
diff --git a/trunk/net/ipv6/ip6_fib.c b/trunk/net/ipv6/ip6_fib.c
index df05c6f2189c..7165a5e90f45 100644
--- a/trunk/net/ipv6/ip6_fib.c
+++ b/trunk/net/ipv6/ip6_fib.c
@@ -1126,9 +1126,6 @@ static void fib6_del_route(struct fib6_node *fn, struct rt6_info **rtp,
 
 	rt->u.dst.rt6_next = NULL;
 
-	if (fn->leaf == NULL && fn->fn_flags&RTN_TL_ROOT)
-		fn->leaf = &ip6_null_entry;
-
 	/* If it was last route, expunge its radix tree node */
 	if (fn->leaf == NULL) {
 		fn->fn_flags &= ~RTN_RTINFO;