[IPV4]: fib_validate_source() annotations

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

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 0dcbf16..c4eca25 100644 (file)
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -20,25 +20,32 @@
 #include <linux/seq_file.h>
 #include <net/fib_rules.h>
 
-/* WARNING: The ordering of these elements must match ordering
- *          of RTA_* rtnetlink attribute numbers.
- */
-struct kern_rta {
-       void            *rta_dst;
-       void            *rta_src;
-       int             *rta_iif;
-       int             *rta_oif;
-       void            *rta_gw;
-       u32             *rta_priority;
-       void            *rta_prefsrc;
-       struct rtattr   *rta_mx;
-       struct rtattr   *rta_mp;
-       unsigned char   *rta_protoinfo;
-       u32             *rta_flow;
-       struct rta_cacheinfo *rta_ci;
-       struct rta_session *rta_sess;
-       u32             *rta_mp_alg;
-};
+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 */
+       u32                     fc_table;
+       u32                     fc_dst;
+       u32                     fc_src;
+       u32                     fc_gw;
+       int                     fc_oif;
+       u32                     fc_flags;
+       u32                     fc_priority;
+       u32                     fc_prefsrc;
+       struct nlattr           *fc_mx;
+       struct rtnexthop        *fc_mp;
+       int                     fc_mx_len;
+       int                     fc_mp_len;
+       u32                     fc_flow;
+       u32                     fc_mp_alg;
+       u32                     fc_nlflags;
+       struct nl_info          fc_nlinfo;
+ };
 
 struct fib_info;
 
@@ -150,15 +157,12 @@ struct fib_result_nl {
 #endif /* CONFIG_IP_ROUTE_MULTIPATH_WRANDOM */
 
 struct fib_table {
+       struct hlist_node tb_hlist;
        u32             tb_id;
        unsigned        tb_stamp;
        int             (*tb_lookup)(struct fib_table *tb, const struct flowi *flp, struct fib_result *res);
-       int             (*tb_insert)(struct fib_table *table, struct rtmsg *r,
-                                    struct kern_rta *rta, struct nlmsghdr *n,
-                                    struct netlink_skb_parms *req);
-       int             (*tb_delete)(struct fib_table *table, struct rtmsg *r,
-                                    struct kern_rta *rta, struct nlmsghdr *n,
-                                    struct netlink_skb_parms *req);
+       int             (*tb_insert)(struct fib_table *, struct fib_config *);
+       int             (*tb_delete)(struct fib_table *, struct fib_config *);
        int             (*tb_dump)(struct fib_table *table, struct sk_buff *skb,
                                     struct netlink_callback *cb);
        int             (*tb_flush)(struct fib_table *table);
@@ -200,41 +204,26 @@ static inline void fib_select_default(const struct flowi *flp, struct fib_result
 }
 
 #else /* CONFIG_IP_MULTIPLE_TABLES */
-#define ip_fib_local_table (fib_tables[RT_TABLE_LOCAL])
-#define ip_fib_main_table (fib_tables[RT_TABLE_MAIN])
+#define ip_fib_local_table fib_get_table(RT_TABLE_LOCAL)
+#define ip_fib_main_table fib_get_table(RT_TABLE_MAIN)
 
-extern struct fib_table * fib_tables[RT_TABLE_MAX+1];
 extern int fib_lookup(struct flowi *flp, struct fib_result *res);
-extern struct fib_table *__fib_new_table(u32 id);
-
-static inline struct fib_table *fib_get_table(u32 id)
-{
-       if (id == 0)
-               id = RT_TABLE_MAIN;
-
-       return fib_tables[id];
-}
-
-static inline struct fib_table *fib_new_table(u32 id)
-{
-       if (id == 0)
-               id = RT_TABLE_MAIN;
-
-       return fib_tables[id] ? : __fib_new_table(id);
-}
 
+extern struct fib_table *fib_new_table(u32 id);
+extern struct fib_table *fib_get_table(u32 id);
 extern void fib_select_default(const struct flowi *flp, struct fib_result *res);
 
 #endif /* CONFIG_IP_MULTIPLE_TABLES */
 
 /* 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(u32 src, u32 dst, u8 tos, int oif,
-                              struct net_device *dev, u32 *spec_dst, u32 *itag);
+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);
 
 struct rtentry;
@@ -243,8 +232,6 @@ struct rtentry;
 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 u32  __fib_res_prefsrc(struct fib_result *res);
 
 /* Exported by fib_hash.c */