Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[sfrench/cifs-2.6.git] / include / net / ip6_route.h

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index f920706d526b4397288240e9e11bf6bcaa07db54..a398ae5e30f991c427638af44216de453492474f 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -7,12 +7,28 @@
 #define IP6_RT_PRIO_KERN       512
 #define IP6_RT_FLOW_MASK       0x00ff
 
+struct route_info {
+       __u8                    type;
+       __u8                    length;
+       __u8                    prefix_len;
+#if defined(__BIG_ENDIAN_BITFIELD)
+       __u8                    reserved_h:3,
+                               route_pref:2,
+                               reserved_l:3;
+#elif defined(__LITTLE_ENDIAN_BITFIELD)
+       __u8                    reserved_l:3,
+                               route_pref:2,
+                               reserved_h:3;
+#endif
+       __u32                   lifetime;
+       __u8                    prefix[0];      /* 0,8 or 16 */
+};
+
 #ifdef __KERNEL__
 
 #include <net/flow.h>
 #include <net/ip6_fib.h>
 #include <net/sock.h>
-#include <linux/tcp.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 
@@ -88,11 +104,14 @@ extern struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
 extern struct rt6_info *       rt6_get_dflt_router(struct in6_addr *addr,
                                                    struct net_device *dev);
 extern struct rt6_info *       rt6_add_dflt_router(struct in6_addr *gwaddr,
-                                                   struct net_device *dev);
+                                                   struct net_device *dev,
+                                                   unsigned int pref);
 
 extern void                    rt6_purge_dflt_routers(void);
 
-extern void                    rt6_reset_dflt_pointer(struct rt6_info *rt);
+extern int                     rt6_route_rcv(struct net_device *dev,
+                                             u8 *opt, int len,
+                                             struct in6_addr *gwaddr);
 
 extern void                    rt6_redirect(struct in6_addr *dest,
                                             struct in6_addr *saddr,