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

diff --git a/include/net/route.h b/include/net/route.h
index d479875b7..ffdf3b111 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -114,7 +114,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);
@@ -230,7 +230,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