X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fnode_funcs.h;h=d848419cb3efefb64f539ab6dd05848d0391af8f;hb=e3248989586ade29baba635aae66b06995917221;hp=577e013c7617338729a134e6a522a5ed79af2443;hpb=6a5adc369591fcac2447e9809deaa22f56b53911;p=vpp.git

diff --git a/src/vlib/node_funcs.h b/src/vlib/node_funcs.h
index 577e013c761..d848419cb3e 100644
--- a/src/vlib/node_funcs.h
+++ b/src/vlib/node_funcs.h
@@ -818,7 +818,15 @@ vlib_process_signal_event_helper (vlib_node_main_t * nm,
     {
       /* Waiting for both event and clock? */
       if (p_flags & VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT)
-	delete_from_wheel = 1;
+	{
+	  if (!TW (tw_timer_handle_is_free)
+	      ((TWT (tw_timer_wheel) *) nm->timing_wheel,
+	       p->stop_timer_handle))
+	    delete_from_wheel = 1;
+	  else
+	    /* timer just popped so process should already be on the list */
+	    add_to_pending = 0;
+	}
       else
 	/* Waiting only for clock.  Event will be queue and may be
 	   handled when timer expires. */