Merge git://git.infradead.org/mtd-2.6

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

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 0d40f84df21b08be9a0326fbc9e81a7b31bd124f..6ca6b71dfe0f07406f9222092da64559358df696 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -32,6 +32,10 @@ struct route_info {
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 
+#define RT6_LOOKUP_F_IFACE     0x1
+#define RT6_LOOKUP_F_REACHABLE 0x2
+#define RT6_LOOKUP_F_HAS_SADDR 0x4
+
 struct pol_chain {
        int                     type;
        int                     priority;
@@ -53,8 +57,6 @@ extern void                   ip6_route_input(struct sk_buff *skb);
 extern struct dst_entry *      ip6_route_output(struct sock *sk,
                                                 struct flowi *fl);
 
-extern int                     ip6_route_me_harder(struct sk_buff *skb);
-
 extern void                    ip6_route_init(void);
 extern void                    ip6_route_cleanup(void);