[IPVS]: make sure timer expires on one cpu

eab3e65d · Julian Anastasov · David S. Miller · 3646a423 · eab3e65d
Commit eab3e65d authored Nov 11, 2003 by Julian Anastasov Committed by David S. Miller Nov 11, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

net/ipv4/ipvs/ip_vs_conn.c net/ipv4/ipvs/ip_vs_conn.c +2 -2

No files found.
--- a/net/ipv4/ipvs/ip_vs_conn.c
+++ b/net/ipv4/ipvs/ip_vs_conn.c
@@ -535,8 +535,8 @@ static void ip_vs_conn_expire(unsigned long data)

 void ip_vs_conn_expire_now(struct ip_vs_conn *cp)
 {
-	cp->timeout = 0;
-	mod_timer(&cp->timer, jiffies);
+	if (del_timer(&cp->timer))
+		mod_timer(&cp->timer, jiffies);
 	__ip_vs_conn_put(cp);
 }