patch-2.1.89 linux/include/net/ip_fib.h

Next file: linux/include/net/ipv6.h
Previous file: linux/include/net/ip6_route.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.88/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
@@ -18,6 +18,29 @@
 
 #include <linux/config.h>
 
+struct kern_rta
+{
+	void		*rta_dst;
+	void		*rta_src;
+	int		*rta_iif;
+	int		*rta_oif;
+	void		*rta_gw;
+	u32		*rta_priority;
+	void		*rta_prefsrc;
+#ifdef CONFIG_RTNL_OLD_IFINFO
+	unsigned	*rta_window;
+	unsigned	*rta_rtt;
+	unsigned	*rta_mtu;
+	unsigned char	*rta_ifname;
+#else
+	struct rtattr	*rta_mx;
+	struct rtattr	*rta_mp;
+	unsigned char	*rta_protoinfo;
+	unsigned char	*rta_flow;
+#endif
+	struct rta_cacheinfo *rta_ci;
+};
+
 struct fib_nh
 {
 	struct device		*nh_dev;
@@ -43,9 +66,17 @@
 	unsigned		fib_flags;
 	int			fib_protocol;
 	u32			fib_prefsrc;
+#ifdef CONFIG_RTNL_OLD_IFINFO
 	unsigned		fib_mtu;
 	unsigned		fib_rtt;
 	unsigned		fib_window;
+#else
+#define FIB_MAX_METRICS RTAX_RTT
+	unsigned		fib_metrics[FIB_MAX_METRICS];
+#define fib_mtu fib_metrics[RTAX_MTU-1]
+#define fib_window fib_metrics[RTAX_WINDOW-1]
+#define fib_rtt fib_metrics[RTAX_RTT-1]
+#endif
 	int			fib_nhs;
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
 	int			fib_power;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov