Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

[pandora-kernel.git] / include / net / ip6_route.h

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index c850e5f..5e91b72 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -21,8 +21,6 @@ struct route_info {
        __u8                    prefix[0];      /* 0,8 or 16 */
 };
 
-#ifdef __KERNEL__
-
 #include <net/flow.h>
 #include <net/ip6_fib.h>
 #include <net/sock.h>
@@ -84,6 +82,12 @@ 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_route_get_saddr(struct net *net,
+                                                   struct rt6_info *rt,
+                                                   const struct in6_addr *daddr,
+                                                   unsigned int prefs,
+                                                   struct in6_addr *saddr);
+
 extern struct rt6_info         *rt6_lookup(struct net *net,
                                            const struct in6_addr *daddr,
                                            const struct in6_addr *saddr,
@@ -106,9 +110,9 @@ extern int                  ip6_dst_hoplimit(struct dst_entry *dst);
  *     support functions for ND
  *
  */
-extern struct rt6_info *       rt6_get_dflt_router(struct in6_addr *addr,
+extern struct rt6_info *       rt6_get_dflt_router(const struct in6_addr *addr,
                                                    struct net_device *dev);
-extern struct rt6_info *       rt6_add_dflt_router(struct in6_addr *gwaddr,
+extern struct rt6_info *       rt6_add_dflt_router(const struct in6_addr *gwaddr,
                                                    struct net_device *dev,
                                                    unsigned int pref);
 
@@ -116,17 +120,17 @@ extern void                       rt6_purge_dflt_routers(struct net *net);
 
 extern int                     rt6_route_rcv(struct net_device *dev,
                                              u8 *opt, int len,
-                                             struct in6_addr *gwaddr);
+                                             const struct in6_addr *gwaddr);
 
-extern void                    rt6_redirect(struct in6_addr *dest,
-                                            struct in6_addr *src,
-                                            struct in6_addr *saddr,
+extern void                    rt6_redirect(const struct in6_addr *dest,
+                                            const struct in6_addr *src,
+                                            const struct in6_addr *saddr,
                                             struct neighbour *neigh,
                                             u8 *lladdr,
                                             int on_link);
 
-extern void                    rt6_pmtu_discovery(struct in6_addr *daddr,
-                                                  struct in6_addr *saddr,
+extern void                    rt6_pmtu_discovery(const struct in6_addr *daddr,
+                                                  const struct in6_addr *saddr,
                                                   struct net_device *dev,
                                                   u32 pmtu);
 
@@ -141,6 +145,7 @@ struct rt6_rtnl_dump_arg {
 extern int rt6_dump_route(struct rt6_info *rt, void *p_arg);
 extern void rt6_ifdown(struct net *net, struct net_device *dev);
 extern void rt6_mtu_change(struct net_device *dev, unsigned mtu);
+extern void rt6_remove_prefsrc(struct inet6_ifaddr *ifp);
 
 
 /*
@@ -186,4 +191,3 @@ static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
 }
 
 #endif
-#endif