Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[pandora-kernel.git] / include / net / ip_fib.h

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 9cd0b56..5a4a036 100644 (file)
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -21,17 +21,14 @@
 #include <net/fib_rules.h>
 
 struct fib_config {
-       u8                      fc_family;
        u8                      fc_dst_len;
-       u8                      fc_src_len;
        u8                      fc_tos;
        u8                      fc_protocol;
        u8                      fc_scope;
        u8                      fc_type;
-       /* 1 byte unused */
+       /* 3 bytes unused */
        u32                     fc_table;
        __be32                  fc_dst;
-       __be32                  fc_src;
        __be32                  fc_gw;
        int                     fc_oif;
        u32                     fc_flags;
@@ -107,8 +104,8 @@ struct fib_result {
        unsigned char   type;
        unsigned char   scope;
 #ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
-       __u32           network;
-       __u32           netmask;
+       __be32          network;
+       __be32          netmask;
 #endif
        struct fib_info *fi;
 #ifdef CONFIG_IP_MULTIPLE_TABLES
@@ -117,8 +114,8 @@ struct fib_result {
 };
 
 struct fib_result_nl {
-       u32             fl_addr;   /* To be looked up*/ 
-       u32             fl_fwmark; 
+       __be32          fl_addr;   /* To be looked up*/
+       u32             fl_mark;
        unsigned char   fl_tos;
        unsigned char   fl_scope;
        unsigned char   tb_id_in;
@@ -218,10 +215,6 @@ extern void fib_select_default(const struct flowi *flp, struct fib_result *res);
 /* Exported by fib_frontend.c */
 extern struct nla_policy rtm_ipv4_policy[];
 extern void            ip_fib_init(void);
-extern int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
-extern int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
-extern int inet_rtm_getroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
-extern int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb);
 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_multipath(const struct flowi *flp, struct fib_result *res);
@@ -230,7 +223,7 @@ struct rtentry;
 
 /* Exported by fib_semantics.c */
 extern int ip_fib_check_default(__be32 gw, struct net_device *dev);
-extern int fib_sync_down(u32 local, struct net_device *dev, int force);
+extern int fib_sync_down(__be32 local, struct net_device *dev, int force);
 extern int fib_sync_up(struct net_device *dev);
 extern __be32  __fib_res_prefsrc(struct fib_result *res);
 
@@ -238,8 +231,6 @@ extern __be32  __fib_res_prefsrc(struct fib_result *res);
 extern struct fib_table *fib_hash_init(u32 id);
 
 #ifdef CONFIG_IP_MULTIPLE_TABLES
-extern int fib4_rules_dump(struct sk_buff *skb, struct netlink_callback *cb);
-
 extern void __init fib4_rules_init(void);
 
 #ifdef CONFIG_NET_CLS_ROUTE