diff options
| author | Colin Cross <ccross@android.com> | 2012-05-14 16:41:02 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-05-14 16:41:02 -0700 |
| commit | ec0b571c19ac62ab0bb80d373a3d4922a48b4b75 (patch) | |
| tree | 10c597f5227c969c3f2b909fbeb29725a0c5c6e8 /net/ipv4 | |
| parent | 7bb8b65407a519d3a90dd8cecdd1ccd10ee0c6cc (diff) | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
Merge commit 'v3.4-rc7' into android-3.4
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/fib_trie.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index bce36f1a37b..30b88d7b4bd 100644 --- a/net/ipv4/fib_trie.c +++ b/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); |