Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 2911490..a398ae5 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -7,12 +7,30 @@
 #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 <linux/tcp.h>
+#include <net/sock.h>
 #include <linux/ip.h>
+#include <linux/ipv6.h>
 
 struct pol_chain {
        int                     type;
@@ -39,10 +57,16 @@ extern int                  ipv6_route_ioctl(unsigned int cmd, void __user *arg);
 
 extern int                     ip6_route_add(struct in6_rtmsg *rtmsg,
                                              struct nlmsghdr *,
-                                             void *rtattr);
+                                             void *rtattr,
+                                             struct netlink_skb_parms *req);
+extern int                     ip6_ins_rt(struct rt6_info *,
+                                          struct nlmsghdr *,
+                                          void *rtattr,
+                                          struct netlink_skb_parms *req);
 extern int                     ip6_del_rt(struct rt6_info *,
                                           struct nlmsghdr *,
-                                          void *rtattr);
+                                          void *rtattr,
+                                          struct netlink_skb_parms *req);
 
 extern int                     ip6_rt_addr_add(struct in6_addr *addr,
                                                struct net_device *dev,
@@ -65,10 +89,14 @@ extern struct rt6_info              *rt6_lookup(struct in6_addr *daddr,
 extern struct dst_entry *ndisc_dst_alloc(struct net_device *dev,
                                         struct neighbour *neigh,
                                         struct in6_addr *addr,
-                                        int (*output)(struct sk_buff **));
+                                        int (*output)(struct sk_buff *));
 extern int ndisc_dst_gc(int *more);
 extern void fib6_force_start_gc(void);
 
+extern struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
+                                          const struct in6_addr *addr,
+                                          int anycast);
+
 /*
  *     support functions for ND
  *
@@ -76,13 +104,19 @@ extern void fib6_force_start_gc(void);
 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(int lst_resort);
+extern void                    rt6_purge_dflt_routers(void);
+
+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,
                                             struct neighbour *neigh,
+                                            u8 *lladdr,
                                             int on_link);
 
 extern void                    rt6_pmtu_discovery(struct in6_addr *daddr,
@@ -104,9 +138,7 @@ extern rwlock_t rt6_lock;
 
 /*
  *     Store a destination cache entry in a socket
- *     For UDP/RAW sockets this is done on udp_connect.
  */
-
 static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
                                     struct in6_addr *daddr)
 {