diff options
| author | Denis V. Lunev <den@openvz.org> | 2007-12-08 00:32:23 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:57:01 -0800 |
| commit | 971b893e79db0f7dccfcea15dbdebca3ca64a84d (patch) | |
| tree | e04d0a7c05aec59f1eb2253e7e73d0bdc2f8aed8 /net/ipv4/fib_trie.c | |
| parent | a2bbe6822f8928e254452765c07cb863633113b8 (diff) | |
[IPV4]: last default route is a fib table property
Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_trie.c')
| -rw-r--r-- | net/ipv4/fib_trie.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index c7c5c6c802d..9126eea7167 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1782,8 +1782,6 @@ static int fn_trie_flush(struct fib_table *tb) return found; } -static int trie_last_dflt = -1; - static void fn_trie_select_default(struct fib_table *tb, const struct flowi *flp, struct fib_result *res) { @@ -1830,28 +1828,29 @@ fn_trie_select_default(struct fib_table *tb, const struct flowi *flp, struct fib if (next_fi != res->fi) break; } else if (!fib_detect_death(fi, order, &last_resort, - &last_idx, trie_last_dflt)) { + &last_idx, tb->tb_default)) { fib_result_assign(res, fi); - trie_last_dflt = order; + tb->tb_default = order; goto out; } fi = next_fi; order++; } if (order <= 0 || fi == NULL) { - trie_last_dflt = -1; + tb->tb_default = -1; goto out; } - if (!fib_detect_death(fi, order, &last_resort, &last_idx, trie_last_dflt)) { + if (!fib_detect_death(fi, order, &last_resort, &last_idx, + tb->tb_default)) { fib_result_assign(res, fi); - trie_last_dflt = order; + tb->tb_default = order; goto out; } if (last_idx >= 0) fib_result_assign(res, last_resort); - trie_last_dflt = last_idx; - out:; + tb->tb_default = last_idx; +out: rcu_read_unlock(); } @@ -1978,6 +1977,7 @@ struct fib_table * __init fib_hash_init(u32 id) return NULL; tb->tb_id = id; + tb->tb_default = -1; tb->tb_lookup = fn_trie_lookup; tb->tb_insert = fn_trie_insert; tb->tb_delete = fn_trie_delete; |