From 9569934f224586435c31f85dfe03b1e17e1bc79e Mon Sep 17 00:00:00 2001
From: Julian Anastasov <ja@ssi.bg>
Date: Sun, 17 Oct 2010 16:43:36 +0300
Subject: [PATCH] --- yaml --- r: 215508 b: refs/heads/master c:
 3233759be7eeca9998c514b8f49e8cf2b85e64d3 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/net/netfilter/ipvs/ip_vs_conn.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a226d2c684a3..5d8c1e98722d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb59155f21d4c0507d2034c2953f6a3f7806913d
+refs/heads/master: 3233759be7eeca9998c514b8f49e8cf2b85e64d3
diff --git a/trunk/net/netfilter/ipvs/ip_vs_conn.c b/trunk/net/netfilter/ipvs/ip_vs_conn.c
index 1d1a529dbe24..e9adecdc8ca4 100644
--- a/trunk/net/netfilter/ipvs/ip_vs_conn.c
+++ b/trunk/net/netfilter/ipvs/ip_vs_conn.c
@@ -563,6 +563,8 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
 		 */
 		if (!(cp->flags & IP_VS_CONN_F_TEMPLATE))
 			conn_flags &= ~IP_VS_CONN_F_INACTIVE;
+		/* connections inherit forwarding method from dest */
+		cp->flags &= ~IP_VS_CONN_F_FWD_MASK;
 	}
 	cp->flags |= conn_flags;
 	cp->dest = dest;