linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index d859c41..1f2e428 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -12,7 +12,6 @@
 #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>
 
@@ -41,13 +40,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);
+                                          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,
@@ -70,7 +72,7 @@ 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);
 
@@ -87,7 +89,7 @@ extern struct rt6_info *      rt6_get_dflt_router(struct in6_addr *addr,
 extern struct rt6_info *       rt6_add_dflt_router(struct in6_addr *gwaddr,
                                                    struct net_device *dev);
 
-extern void                    rt6_purge_dflt_routers(int lst_resort);
+extern void                    rt6_purge_dflt_routers(void);
 
 extern void                    rt6_reset_dflt_pointer(struct rt6_info *rt);