vserver 2.0 rc7

[linux-2.6.git] / include / net / route.h

diff --git a/include/net/route.h b/include/net/route.h
index 93b1966..33b131d 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -7,7 +7,7 @@
  *
  * Version:    @(#)route.h     1.0.4   05/27/93
  *
- * Authors:    Ross Biro, <bir7@leland.Stanford.Edu>
+ * Authors:    Ross Biro
  *             Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
  * Fixes:
  *             Alan Cox        :       Reformatted. Added ip_rt_local()
@@ -45,8 +45,9 @@
 /* RTO_CONN is not used (being alias for 0), but preserved not to break
  * some modules referring to it. */
 
-#define RT_CONN_FLAGS(sk)   (RT_TOS(inet_sk(sk)->tos) | sk->sk_localroute)
+#define RT_CONN_FLAGS(sk)   (RT_TOS(inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
 
+struct fib_nh;
 struct inet_peer;
 struct rtable
 {
@@ -59,7 +60,8 @@ struct rtable
        struct in_device        *idev;
        
        unsigned                rt_flags;
-       unsigned                rt_type;
+       __u16                   rt_type;
+       __u16                   rt_multipath_alg;
 
        __u32                   rt_dst; /* Path destination     */
        __u32                   rt_src; /* Path source          */