diff options
-rw-r--r-- | include/net/ip_fib.h | 3 | ||||
-rw-r--r-- | net/ipv4/fib_hash.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index ed514bfb61b..690fb4dd750 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -191,9 +191,6 @@ extern void __init fib4_rules_init(void); extern u32 fib_rules_tclass(struct fib_result *res); #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 struct fib_table *fib_new_table(u32 id); diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c index eb1aa8eead0..638185eb315 100644 --- a/net/ipv4/fib_hash.c +++ b/net/ipv4/fib_hash.c @@ -811,7 +811,8 @@ struct fib_iter_state { static struct fib_alias *fib_get_first(struct seq_file *seq) { 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->hash_head = NULL; @@ -950,7 +951,7 @@ static void *fib_seq_start(struct seq_file *seq, loff_t *pos) void *v = NULL; 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; return v; } |