Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux...

[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 5456fdd6d047b1e8149814a623ee77ed56670970..f99e4f0f568f902c8cd67f3dbc49517dcc26200e 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -1,11 +1,9 @@
 #ifndef _NET_IP6_ROUTE_H
 #define _NET_IP6_ROUTE_H
 
-#define IP6_RT_PRIO_FW         16
 #define IP6_RT_PRIO_USER       1024
 #define IP6_RT_PRIO_ADDRCONF   256
 #define IP6_RT_PRIO_KERN       512
-#define IP6_RT_FLOW_MASK       0x00ff
 
 struct route_info {
        __u8                    type;
@@ -43,14 +41,12 @@ extern struct rt6_info      ip6_prohibit_entry;
 extern struct rt6_info ip6_blk_hole_entry;
 #endif
 
-extern int ip6_rt_gc_interval;
-
 extern void                    ip6_route_input(struct sk_buff *skb);
 
 extern struct dst_entry *      ip6_route_output(struct sock *sk,
                                                 struct flowi *fl);
 
-extern void                    ip6_route_init(void);
+extern int                     ip6_route_init(void);
 extern void                    ip6_route_cleanup(void);
 
 extern int                     ipv6_route_ioctl(unsigned int cmd, void __user *arg);