Merge trunk revision 2988:

r2988 | sdake | 2010-07-14 11:35:36 -0700 (Wed, 14 Jul 2010) | 4 lines

Remove reset of token timeout on retransmitted token reception.  The timer
should only be reset when a real token is received or membership protocol
could run into problems with certain timing parameters.



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2989 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/totemsrp.c

@@ -3448,23 +3448,6 @@ static int message_handler_orf_token (
 		 * Discard retransmitted tokens
 		 */
 		if (sq_lte_compare (token->token_seq, instance->my_token_seq)) {
-			/*
-			 * If this processor receives a retransmitted token, it is sure
-		 	 * the previous processor is still alive.  As a result, it can
-			 * reset its token timeout.  If some processor previous to that
-			 * has failed, it will eventually not execute a reset of the
-			 * token timeout, and will cause a reconfiguration to occur.
-			 */
-			reset_token_timeout (instance);
-
-			if ((forward_token)
-				&& instance->use_heartbeat) {
-				reset_heartbeat_timeout(instance);
-			}
-			else {
-				cancel_heartbeat_timeout(instance);
-			}
-
 			return (0); /* discard token */
 		}
 		last_aru = instance->my_last_aru;