From 5bd4f9b343fdf7de9598a8b6f9692c5edaa33f52 Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Tue, 30 Jun 2009 12:47:19 -0700
Subject: [PATCH] --- yaml --- r: 154689 b: refs/heads/master c:
 008440e3ad4b72f5048d1b1f6f5ed894fdc5ad08 h: refs/heads/master i:   154687:
 08f6d11f752a79eb344b06c69c711f64ddb98960 v: v3

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

diff --git a/[refs] b/[refs]
index a561af7daf75..fedbf850faa3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01e532981460594fffbf9b992ecfc96a78369924
+refs/heads/master: 008440e3ad4b72f5048d1b1f6f5ed894fdc5ad08
diff --git a/trunk/net/ipv4/fib_trie.c b/trunk/net/ipv4/fib_trie.c
index 012cf5a68581..00a54b246dfe 100644
--- a/trunk/net/ipv4/fib_trie.c
+++ b/trunk/net/ipv4/fib_trie.c
@@ -1021,6 +1021,9 @@ static void trie_rebalance(struct trie *t, struct tnode *tn)
 				      (struct node *)tn, wasfull);
 
 		tp = node_parent((struct node *) tn);
+		if (!tp)
+			rcu_assign_pointer(t->trie, (struct node *)tn);
+
 		tnode_free_flush();
 		if (!tp)
 			break;