[IPV4]: Move some fib_semantics exports into fib_lookup.h

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 2cea1dc5a8cc4479f40c754b91d6c00d23c061e2..48a6ea4c2565391417e6ff8a5f60d712e671f820 100644 (file)
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -210,22 +210,11 @@ extern int fib_validate_source(u32 src, u32 dst, u8 tos, int oif,
 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 --git a/net/ipv4/fib_lookup.h b/net/ipv4/fib_lookup.h
index 22a4382e83e5570de1b9cce2a62c06332a1f09cb..b93561cfaf8710d6609cc58ead772b66033a9714 100644 (file)
--- a/net/ipv4/fib_lookup.h
+++ b/net/ipv4/fib_lookup.h
@@ -16,4 +16,18 @@ struct fib_alias {
 
 #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 --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index a77748d9679953ef029b3140306e896fcf1af52f..9c01c6487ef51f9a217b0af9b23446882a5dfb0f 100644 (file)
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -43,6 +43,8 @@
 #include <net/sock.h>
 #include <net/ip_fib.h>
 
+#include "fib_lookup.h"
+
 #define FSprintk(a...)
 
 static rwlock_t fib_info_lock = RW_LOCK_UNLOCKED;