Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / include / net / ip6_route.h

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 6ca6b71dfe0f07406f9222092da64559358df696..f99e4f0f568f902c8cd67f3dbc49517dcc26200e 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -1,11 +1,9 @@
 #ifndef _NET_IP6_ROUTE_H
 #define _NET_IP6_ROUTE_H
 
-#define IP6_RT_PRIO_FW         16
 #define IP6_RT_PRIO_USER       1024
 #define IP6_RT_PRIO_ADDRCONF   256
 #define IP6_RT_PRIO_KERN       512
-#define IP6_RT_FLOW_MASK       0x00ff
 
 struct route_info {
        __u8                    type;
@@ -20,7 +18,7 @@ struct route_info {
                                route_pref:2,
                                reserved_h:3;
 #endif
-       __u32                   lifetime;
+       __be32                  lifetime;
        __u8                    prefix[0];      /* 0,8 or 16 */
 };
 
@@ -36,13 +34,6 @@ struct route_info {
 #define RT6_LOOKUP_F_REACHABLE 0x2
 #define RT6_LOOKUP_F_HAS_SADDR 0x4
 
-struct pol_chain {
-       int                     type;
-       int                     priority;
-       struct fib6_node        *rules;
-       struct pol_chain        *next;
-};
-
 extern struct rt6_info ip6_null_entry;
 
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -50,14 +41,12 @@ extern struct rt6_info      ip6_prohibit_entry;
 extern struct rt6_info ip6_blk_hole_entry;
 #endif
 
-extern int ip6_rt_gc_interval;
-
 extern void                    ip6_route_input(struct sk_buff *skb);
 
 extern struct dst_entry *      ip6_route_output(struct sock *sk,
                                                 struct flowi *fl);
 
-extern void                    ip6_route_init(void);
+extern int                     ip6_route_init(void);
 extern void                    ip6_route_cleanup(void);
 
 extern int                     ipv6_route_ioctl(unsigned int cmd, void __user *arg);
@@ -123,12 +112,7 @@ extern void                        rt6_pmtu_discovery(struct in6_addr *daddr,
                                                   struct net_device *dev,
                                                   u32 pmtu);
 
-struct nlmsghdr;
 struct netlink_callback;
-extern int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb);
-extern int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
-extern int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
-extern int inet6_rtm_getroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
 
 struct rt6_rtnl_dump_arg
 {