vserver 1.9.3

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

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 794ff35..d859c41 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -11,8 +11,10 @@
 
 #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>
 
 struct pol_chain {
        int                     type;
@@ -35,11 +37,14 @@ extern int                  ip6_route_me_harder(struct sk_buff *skb);
 extern void                    ip6_route_init(void);
 extern void                    ip6_route_cleanup(void);
 
-extern int                     ipv6_route_ioctl(unsigned int cmd, void *arg);
+extern int                     ipv6_route_ioctl(unsigned int cmd, void __user *arg);
 
 extern int                     ip6_route_add(struct in6_rtmsg *rtmsg,
                                              struct nlmsghdr *,
                                              void *rtattr);
+extern int                     ip6_ins_rt(struct rt6_info *,
+                                          struct nlmsghdr *,
+                                          void *rtattr);
 extern int                     ip6_del_rt(struct rt6_info *,
                                           struct nlmsghdr *,
                                           void *rtattr);
@@ -65,10 +70,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
  *
@@ -80,9 +89,12 @@ extern struct rt6_info *     rt6_add_dflt_router(struct in6_addr *gwaddr,
 
 extern void                    rt6_purge_dflt_routers(int lst_resort);
 
+extern void                    rt6_reset_dflt_pointer(struct rt6_info *rt);
+
 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 +116,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)
 {