diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /include/net/ip_fib.h | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'include/net/ip_fib.h')
| -rw-r--r-- | include/net/ip_fib.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 36c635ca1aa6..5a4a0366c24f 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h | |||
| @@ -215,10 +215,6 @@ extern void fib_select_default(const struct flowi *flp, struct fib_result *res); | |||
| 215 | /* Exported by fib_frontend.c */ | 215 | /* Exported by fib_frontend.c */ |
| 216 | extern struct nla_policy rtm_ipv4_policy[]; | 216 | extern struct nla_policy rtm_ipv4_policy[]; |
| 217 | extern void ip_fib_init(void); | 217 | extern void ip_fib_init(void); |
| 218 | extern int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg); | ||
| 219 | extern int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg); | ||
| 220 | extern int inet_rtm_getroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg); | ||
| 221 | extern int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb); | ||
| 222 | extern int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif, | 218 | extern int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif, |
| 223 | struct net_device *dev, __be32 *spec_dst, u32 *itag); | 219 | struct net_device *dev, __be32 *spec_dst, u32 *itag); |
| 224 | extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res); | 220 | extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res); |
| @@ -235,8 +231,6 @@ extern __be32 __fib_res_prefsrc(struct fib_result *res); | |||
| 235 | extern struct fib_table *fib_hash_init(u32 id); | 231 | extern struct fib_table *fib_hash_init(u32 id); |
| 236 | 232 | ||
| 237 | #ifdef CONFIG_IP_MULTIPLE_TABLES | 233 | #ifdef CONFIG_IP_MULTIPLE_TABLES |
| 238 | extern int fib4_rules_dump(struct sk_buff *skb, struct netlink_callback *cb); | ||
| 239 | |||
| 240 | extern void __init fib4_rules_init(void); | 234 | extern void __init fib4_rules_init(void); |
| 241 | 235 | ||
| 242 | #ifdef CONFIG_NET_CLS_ROUTE | 236 | #ifdef CONFIG_NET_CLS_ROUTE |