# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1198  -> 1.1199 
#	net/ipv4/ipvs/ip_vs_ftp.c	1.2     -> 1.3    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/10/17	wensong@xxxxxxxxxxxx	1.1199
# [IPVS] Fix ip_vs_ftp to use cp->vaddr because iph->daddr is already mangled
# 
# --------------------------------------------
#
diff -Nru a/net/ipv4/ipvs/ip_vs_ftp.c b/net/ipv4/ipvs/ip_vs_ftp.c
--- a/net/ipv4/ipvs/ip_vs_ftp.c	Fri Oct 17 22:43:57 2003
+++ b/net/ipv4/ipvs/ip_vs_ftp.c	Fri Oct 17 22:43:57 2003
@@ -304,11 +304,12 @@
 	 */
 	IP_VS_DBG(1-debug, "protocol %s %u.%u.%u.%u:%d %u.%u.%u.%u:%d\n",
 		  ip_vs_proto_name(iph->protocol),
-		  NIPQUAD(to), ntohs(port), NIPQUAD(iph->daddr), 0);
+		  NIPQUAD(to), ntohs(port),
+		  NIPQUAD(cp->vaddr), ntohs(cp->vport) - 1);
 
 	n_cp = ip_vs_conn_in_get(iph->protocol,
 				 to, port,
-				 iph->daddr, htons(ntohs(cp->vport)-1));
+				 cp->vaddr, htons(ntohs(cp->vport)-1));
 	if (!n_cp) {
 		n_cp = ip_vs_conn_new(IPPROTO_TCP,
 				      to, port,