# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/09/28 20:59:05-07:00 davem@nuts.davemloft.net # [IPV4]: Move some fib_semantics exports into fib_lookup.h # # Signed-off-by: David S. Miller # # net/ipv4/fib_semantics.c # 2004/09/28 20:58:33-07:00 davem@nuts.davemloft.net +2 -0 # [IPV4]: Move some fib_semantics exports into fib_lookup.h # # net/ipv4/fib_lookup.h # 2004/09/28 20:58:33-07:00 davem@nuts.davemloft.net +14 -0 # [IPV4]: Move some fib_semantics exports into fib_lookup.h # # include/net/ip_fib.h # 2004/09/28 20:58:33-07:00 davem@nuts.davemloft.net +1 -12 # [IPV4]: Move some fib_semantics exports into fib_lookup.h # diff -Nru a/include/net/ip_fib.h b/include/net/ip_fib.h --- a/include/net/ip_fib.h 2004-09-28 21:25:03 -07:00 +++ b/include/net/ip_fib.h 2004-09-28 21:25:03 -07:00 @@ -210,22 +210,11 @@ extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res); /* Exported by fib_semantics.c */ -extern int ip_fib_check_default(u32 gw, struct net_device *dev); -extern void fib_release_info(struct fib_info *); -extern int fib_semantic_match(int type, struct fib_info *, - const struct flowi *, struct fib_result*); -extern struct fib_info *fib_create_info(const struct rtmsg *r, struct kern_rta *rta, - const struct nlmsghdr *, int *err); -extern int fib_nh_match(struct rtmsg *r, struct nlmsghdr *, struct kern_rta *rta, struct fib_info *fi); -extern int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, - u8 tb_id, u8 type, u8 scope, void *dst, int dst_len, u8 tos, - struct fib_info *fi); +extern int ip_fib_check_default(u32 gw, struct net_device *dev); extern int fib_sync_down(u32 local, struct net_device *dev, int force); extern int fib_sync_up(struct net_device *dev); extern int fib_convert_rtentry(int cmd, struct nlmsghdr *nl, struct rtmsg *rtm, struct kern_rta *rta, struct rtentry *r); -extern void fib_node_seq_show(struct seq_file *seq, int type, int dead, - struct fib_info *fi, u32 prefix, u32 mask); extern u32 __fib_res_prefsrc(struct fib_result *res); /* Exported by fib_hash.c */ diff -Nru a/net/ipv4/fib_lookup.h b/net/ipv4/fib_lookup.h --- a/net/ipv4/fib_lookup.h 2004-09-28 21:25:03 -07:00 +++ b/net/ipv4/fib_lookup.h 2004-09-28 21:25:03 -07:00 @@ -16,4 +16,18 @@ #define FA_S_ACCESSED 0x01 +/* Exported by fib_semantics.c */ +extern int fib_semantic_match(int type, struct fib_info *, + const struct flowi *, struct fib_result *); +extern void fib_release_info(struct fib_info *); +extern struct fib_info *fib_create_info(const struct rtmsg *r, + struct kern_rta *rta, + const struct nlmsghdr *, + int *err); +extern int fib_nh_match(struct rtmsg *r, struct nlmsghdr *, + struct kern_rta *rta, struct fib_info *fi); +extern int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, + u8 tb_id, u8 type, u8 scope, void *dst, + int dst_len, u8 tos, struct fib_info *fi); + #endif /* _FIB_LOOKUP_H */ diff -Nru a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c --- a/net/ipv4/fib_semantics.c 2004-09-28 21:25:03 -07:00 +++ b/net/ipv4/fib_semantics.c 2004-09-28 21:25:03 -07:00 @@ -43,6 +43,8 @@ #include #include +#include "fib_lookup.h" + #define FSprintk(a...) static rwlock_t fib_info_lock = RW_LOCK_UNLOCKED;