X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fnet%2Fip6_fib.h;h=4cefcffe773e29d88b0e6284e998f5424b4ffd67;hb=e38bad4766a110b61fa6038f10be16ced8c6cc38;hp=9eda572a2a6534f157b233b71f22bf9ed70abd65;hpb=4559b438225b01942e1661759db0df55883b1bc0;p=linux-2.6

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 9eda572a2a..4cefcffe77 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -58,6 +58,7 @@ struct fib6_node
 	__u16			fn_bit;		/* bit key */
 	__u16			fn_flags;
 	__u32			fn_sernum;
+	struct rt6_info		*rr_ptr;
 };
 
 #ifndef CONFIG_IPV6_SUBTREES
@@ -98,12 +99,21 @@ struct rt6_info
 	u32				rt6i_flags;
 	u32				rt6i_metric;
 	atomic_t			rt6i_ref;
+
+	/* more non-fragment space at head required */
+	unsigned short			nfheader_len;
+
+	u8				rt6i_protocol;
+
 	struct fib6_table		*rt6i_table;
 
 	struct rt6key			rt6i_dst;
-	struct rt6key			rt6i_src;
 
-	u8				rt6i_protocol;
+#ifdef CONFIG_XFRM
+	u32				rt6i_flow_cache_genid;
+#endif
+
+	struct rt6key			rt6i_src;
 };
 
 static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst)
@@ -218,8 +228,6 @@ extern void			fib6_init(void);
 
 extern void			fib6_rules_init(void);
 extern void			fib6_rules_cleanup(void);
-extern int			fib6_rules_dump(struct sk_buff *,
-						struct netlink_callback *);
 
 #endif
 #endif