Commit bb803175 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller

[IPV4]: Remove ip_fib_local_table and ip_fib_main_table defines.

There are only 2 users and it doesn't hurt to call fib_get_table
instead, and it makes it easier to make the fib network namespace
aware.
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f845ab6b
...@@ -191,9 +191,6 @@ extern void __init fib4_rules_init(void); ...@@ -191,9 +191,6 @@ extern void __init fib4_rules_init(void);
extern u32 fib_rules_tclass(struct fib_result *res); extern u32 fib_rules_tclass(struct fib_result *res);
#endif #endif
#define ip_fib_local_table fib_get_table(RT_TABLE_LOCAL)
#define ip_fib_main_table fib_get_table(RT_TABLE_MAIN)
extern int fib_lookup(struct flowi *flp, struct fib_result *res); extern int fib_lookup(struct flowi *flp, struct fib_result *res);
extern struct fib_table *fib_new_table(u32 id); extern struct fib_table *fib_new_table(u32 id);
......
...@@ -811,7 +811,8 @@ struct fib_iter_state { ...@@ -811,7 +811,8 @@ struct fib_iter_state {
static struct fib_alias *fib_get_first(struct seq_file *seq) static struct fib_alias *fib_get_first(struct seq_file *seq)
{ {
struct fib_iter_state *iter = seq->private; struct fib_iter_state *iter = seq->private;
struct fn_hash *table = (struct fn_hash *) ip_fib_main_table->tb_data; struct fib_table *main_table = fib_get_table(RT_TABLE_MAIN);
struct fn_hash *table = (struct fn_hash *)main_table->tb_data;
iter->bucket = 0; iter->bucket = 0;
iter->hash_head = NULL; iter->hash_head = NULL;
...@@ -950,7 +951,7 @@ static void *fib_seq_start(struct seq_file *seq, loff_t *pos) ...@@ -950,7 +951,7 @@ static void *fib_seq_start(struct seq_file *seq, loff_t *pos)
void *v = NULL; void *v = NULL;
read_lock(&fib_hash_lock); read_lock(&fib_hash_lock);
if (ip_fib_main_table) if (fib_get_table(RT_TABLE_MAIN))
v = *pos ? fib_get_idx(seq, *pos - 1) : SEQ_START_TOKEN; v = *pos ? fib_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
return v; return v;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment