# 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.1348  -> 1.1349 
#	net/ipv4/ipvs/ip_vs_conn.c	1.11    -> 1.12   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/11/11	ja@xxxxxx	1.1349
# [IPVS]: make sure the timer expires on one cpu
# --------------------------------------------
#
diff -Nru a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
--- a/net/ipv4/ipvs/ip_vs_conn.c	Tue Nov 11 08:52:16 2003
+++ b/net/ipv4/ipvs/ip_vs_conn.c	Tue Nov 11 08:52:16 2003
@@ -535,8 +535,10 @@
 
 void ip_vs_conn_expire_now(struct ip_vs_conn *cp)
 {
-	cp->timeout = 0;
-	mod_timer(&cp->timer, jiffies);
+	if (del_timer(&cp->timer)) {
+		cp->timeout = 0;
+		mod_timer(&cp->timer, jiffies);
+	}
 	__ip_vs_conn_put(cp);
 }