linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/net/route.h b/include/net/route.h
index 4bacfbe..aee215a 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -24,6 +24,7 @@
 #ifndef _ROUTE_H
 #define _ROUTE_H
 
+#include <linux/config.h>
 #include <net/dst.h>
 #include <net/inetpeer.h>
 #include <net/flow.h>
@@ -112,7 +113,7 @@ extern struct ip_rt_acct *ip_rt_acct;
 struct in_device;
 extern int             ip_rt_init(void);
 extern void            ip_rt_redirect(u32 old_gw, u32 dst, u32 new_gw,
-                                      u32 src, struct net_device *dev);
+                                      u32 src, u8 tos, struct net_device *dev);
 extern void            ip_rt_advice(struct rtable **rp, int advice);
 extern void            rt_cache_flush(int how);
 extern int             __ip_route_output_key(struct rtable **, const struct flowi *flp);
@@ -228,7 +229,7 @@ static inline int ip_route_connect(struct rtable **rp, u32 dst,
                        return err;
                if (fl.fl4_dst == IPI_LOOPBACK && !vx_check(0, VX_ADMIN))
                        fl.fl4_dst = nx_info->ipv4[0];
-#ifdef CONFIG_VSERVER_REMAP_SADDR
+#ifdef VSERVER_REMAP_SADDR
                if (fl.fl4_src == IPI_LOOPBACK && !vx_check(0, VX_ADMIN))
                        fl.fl4_src = nx_info->ipv4[0];
 #endif