From 0d06bef8f18fd07ff78692f5e678fa149a8bbab3 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 10 May 2012 22:16:32 -0400 Subject: [PATCH] --- yaml --- r: 300201 b: refs/heads/master c: dccd9ecc374462e5d6a5b8f8110415a86c2213d8 h: refs/heads/master i: 300199: e452a7aebad2517fd94477d055580fe25796d0d4 v: v3 --- [refs] | 2 +- trunk/net/ipv4/fib_trie.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2b2e2ae56147..6e05d420f92c 100644 --- 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 index bce36f1a37b4..30b88d7b4bd6 100644 --- 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);