X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fnet%2Fip6_route.h;h=1f2e428ca364d0dcbcf3031d68892b1a75fb09b7;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=a398ae5e30f991c427638af44216de453492474f;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index a398ae5e3..1f2e428ca 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -7,23 +7,6 @@
 #define IP6_RT_PRIO_KERN	512
 #define IP6_RT_FLOW_MASK	0x00ff
 
-struct route_info {
-	__u8			type;
-	__u8			length;
-	__u8			prefix_len;
-#if defined(__BIG_ENDIAN_BITFIELD)
-	__u8			reserved_h:3,
-				route_pref:2,
-				reserved_l:3;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8			reserved_l:3,
-				route_pref:2,
-				reserved_h:3;
-#endif
-	__u32			lifetime;
-	__u8			prefix[0];	/* 0,8 or 16 */
-};
-
 #ifdef __KERNEL__
 
 #include <net/flow.h>
@@ -104,14 +87,11 @@ extern struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
 extern struct rt6_info *	rt6_get_dflt_router(struct in6_addr *addr,
 						    struct net_device *dev);
 extern struct rt6_info *	rt6_add_dflt_router(struct in6_addr *gwaddr,
-						    struct net_device *dev,
-						    unsigned int pref);
+						    struct net_device *dev);
 
 extern void			rt6_purge_dflt_routers(void);
 
-extern int			rt6_route_rcv(struct net_device *dev,
-					      u8 *opt, int len,
-					      struct in6_addr *gwaddr);
+extern void			rt6_reset_dflt_pointer(struct rt6_info *rt);
 
 extern void			rt6_redirect(struct in6_addr *dest,
 					     struct in6_addr *saddr,