---

yaml --- r: 300201 b: refs/heads/master c: dccd9ec h: refs/heads/master i: 300199: e452a7a v: v3
git-mirror · May 11, 2012 · 0d06bef · 0d06bef
1 parent d2b1819
commit 0d06bef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e0c55165b638e96c8d7097ea638aa368daa268a
+refs/heads/master: dccd9ecc374462e5d6a5b8f8110415a86c2213d8
diff --git a/trunk/net/ipv4/fib_trie.c b/trunk/net/ipv4/fib_trie.c
@@ -1370,6 +1370,8 @@ static int check_leaf(struct fib_table *tb, struct trie *t, struct leaf *l,
 
 			if (fa->fa_tos && fa->fa_tos != flp->flowi4_tos)
 				continue;
+			if (fi->fib_dead)
+				continue;
 			if (fa->fa_info->fib_scope < flp->flowi4_scope)
 				continue;
 			fib_alias_accessed(fa);