summaryrefslogtreecommitdiffstats
path: root/include/net/ip_fib.h
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-01-22 22:03:33 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:11:02 -0800
commit64c2d5382954ccf6054424653f4c7f4f04c1ff21 (patch)
tree8334b52941b63e53178b355a2177880f8ebc78d4 /include/net/ip_fib.h
parente30d3a0ccddbd458b3fb14c9b0229b01d97bad5b (diff)
downloadop-kernel-dev-64c2d5382954ccf6054424653f4c7f4f04c1ff21.zip
op-kernel-dev-64c2d5382954ccf6054424653f4c7f4f04c1ff21.tar.gz
[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 'include/net/ip_fib.h')
-rw-r--r--include/net/ip_fib.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index be70b33..39f944a 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -193,14 +193,6 @@ static inline int fib_lookup(struct net *net, const struct flowi *flp,
return -ENETUNREACH;
}
-static inline void fib_select_default(const struct flowi *flp,
- struct fib_result *res)
-{
- struct fib_table *table = fib_get_table(&init_net, RT_TABLE_MAIN);
- if (FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK)
- table->tb_select_default(table, flp, res);
-}
-
#else /* CONFIG_IP_MULTIPLE_TABLES */
extern int __net_init fib4_rules_init(struct net *net);
extern void __net_exit fib4_rules_exit(struct net *net);
@@ -213,7 +205,6 @@ extern int fib_lookup(struct net *n, struct flowi *flp, struct fib_result *res);
extern struct fib_table *fib_new_table(struct net *net, u32 id);
extern struct fib_table *fib_get_table(struct net *net, u32 id);
-extern void fib_select_default(const struct flowi *flp, struct fib_result *res);
#endif /* CONFIG_IP_MULTIPLE_TABLES */
@@ -222,6 +213,7 @@ extern const struct nla_policy rtm_ipv4_policy[];
extern void ip_fib_init(void);
extern int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
struct net_device *dev, __be32 *spec_dst, u32 *itag);
+extern void fib_select_default(const struct flowi *flp, struct fib_result *res);
/* Exported by fib_semantics.c */
extern int ip_fib_check_default(__be32 gw, struct net_device *dev);
OpenPOWER on IntegriCloud