Skip to contentSkip to conversation

Remove ip_fib_local_table and ip_fib_main_table defines

PATCH Applied Denis V. Lunev 2 participants 2 messages Dec 6, 2007 – Dec 7, 2007

Subsystems (3)
Networking Network drivers IPv4/IPv6
lore
Share & tools
lore

Denis V. Lunev

author
#0 lore raw

PATCH 1/1 Remove ip_fib_local_table and ip_fib_main_table defines

From: Eric W. Biederman <[email protected]>

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 <[email protected]>
Signed-off-by Denis V. Lunev <[email protected]>
---
 include/net/ip_fib.h |    3 ---
 net/ipv4/fib_hash.c  |    5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)
include/net/ip_fib.h +0 -3
index ed514bf..690fb4d 100644
@@ -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);
net/ipv4/fib_hash.c +3 -2
index 9d0cee2..30ff657 100644
@@ -810,7 +810,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;

@@ -949,7 +950,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;
 }
Signature · 1 line
1.5.3.rc5