# 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.1346  -> 1.1347 
#	net/ipv4/ipvs/ip_vs_core.c	1.6     -> 1.7    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/10/13	wensong@xxxxxxxxxxxx	1.1347
# [IPVS] Fix the sync state check for connection to be synchronized
# 
# Patch from Horms <horms@xxxxxxxxxxxx>
# 
# Since both the primay and the backup sync daemon can be started in a box
# at a time, we must just check if the MASTER bit is set in the sync state.
# --------------------------------------------
#
diff -Nru a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c
--- a/net/ipv4/ipvs/ip_vs_core.c	Mon Oct 13 23:04:52 2003
+++ b/net/ipv4/ipvs/ip_vs_core.c	Mon Oct 13 23:04:52 2003
@@ -1044,7 +1044,7 @@
 	/* increase its packet counter and check if it is needed
 	   to be synchronized */
 	atomic_inc(&cp->in_pkts);
-	if (ip_vs_sync_state == IP_VS_STATE_MASTER &&
+	if ((ip_vs_sync_state & IP_VS_STATE_MASTER) &&
 	    (cp->protocol != IPPROTO_TCP ||
 	     cp->state == IP_VS_TCP_S_ESTABLISHED) &&
 	    (atomic_read(&cp->in_pkts) % sysctl_ip_vs_sync_threshold[1]