Skip to content

Commit

Permalink
[IPV4]: Remove ip_fib_local_table and ip_fib_main_table defines.
Browse files Browse the repository at this point in the history
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: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric W. Biederman authored and David S. Miller committed Jan 28, 2008
1 parent f845ab6 commit bb80317
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 0 additions & 3 deletions include/net/ip_fib.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions net/ipv4/fib_hash.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit bb80317

Please sign in to comment.