Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...

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

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 3ae6799c2b141e5d7fc39828a17466056bbb0491..2f8b3c06a10198b7c51d1029965284c802a395b9 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -37,7 +37,6 @@ struct route_info {
 #define RT6_LOOKUP_F_SRCPREF_PUBLIC    0x00000010
 #define RT6_LOOKUP_F_SRCPREF_COA       0x00000020
 
-extern struct rt6_info *ip6_null_entry;
 
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
 extern struct rt6_info *ip6_prohibit_entry;
@@ -61,29 +60,15 @@ extern int                  ip6_route_add(struct fib6_config *cfg);
 extern int                     ip6_ins_rt(struct rt6_info *);
 extern int                     ip6_del_rt(struct rt6_info *);
 
-extern int                     ip6_rt_addr_add(struct in6_addr *addr,
-                                               struct net_device *dev,
-                                               int anycast);
-
-extern int                     ip6_rt_addr_del(struct in6_addr *addr,
-                                               struct net_device *dev);
-
-extern void                    rt6_sndmsg(int type, struct in6_addr *dst,
-                                          struct in6_addr *src,
-                                          struct in6_addr *gw,
-                                          struct net_device *dev, 
-                                          int dstlen, int srclen,
-                                          int metric, __u32 flags);
-
 extern struct rt6_info         *rt6_lookup(struct net *net,
-                                           struct in6_addr *daddr,
-                                           struct in6_addr *saddr,
+                                           const struct in6_addr *daddr,
+                                           const struct in6_addr *saddr,
                                            int oif, int flags);
 
 extern struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
                                         struct neighbour *neigh,
-                                        struct in6_addr *addr);
-extern int icmp6_dst_gc(int *more);
+                                        const struct in6_addr *addr);
+extern int icmp6_dst_gc(void);
 
 extern void fib6_force_start_gc(struct net *net);