diff options
author | Denis V. Lunev <den@openvz.org> | 2008-01-23 01:03:33 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:11:02 -0500 |
commit | 64c2d5382954ccf6054424653f4c7f4f04c1ff21 (patch) | |
tree | 8334b52941b63e53178b355a2177880f8ebc78d4 /net/ipv4/fib_frontend.c | |
parent | e30d3a0ccddbd458b3fb14c9b0229b01d97bad5b (diff) |
[IPV4]: Consolidate fib_select_default.
The difference in the implementation of the fib_select_default when
CONFIG_IP_MULTIPLE_TABLES is (not) defined looks
negligible. Consolidate it and place into fib_frontend.c.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_frontend.c')
-rw-r--r-- | net/ipv4/fib_frontend.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 6761639dd0e9..13bf01de0ed8 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
@@ -116,6 +116,20 @@ struct fib_table *fib_get_table(struct net *net, u32 id) | |||
116 | } | 116 | } |
117 | #endif /* CONFIG_IP_MULTIPLE_TABLES */ | 117 | #endif /* CONFIG_IP_MULTIPLE_TABLES */ |
118 | 118 | ||
119 | void fib_select_default(const struct flowi *flp, struct fib_result *res) | ||
120 | { | ||
121 | struct fib_table *tb; | ||
122 | int table = RT_TABLE_MAIN; | ||
123 | #ifdef CONFIG_IP_MULTIPLE_TABLES | ||
124 | if (res->r == NULL || res->r->action != FR_ACT_TO_TBL) | ||
125 | return; | ||
126 | table = res->r->table; | ||
127 | #endif | ||
128 | tb = fib_get_table(&init_net, table); | ||
129 | if (FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK) | ||
130 | tb->tb_select_default(tb, flp, res); | ||
131 | } | ||
132 | |||
119 | static void fib_flush(struct net *net) | 133 | static void fib_flush(struct net *net) |
120 | { | 134 | { |
121 | int flushed = 0; | 135 | int flushed = 0; |