4 files changed, 25 insertions, 11 deletions

diff --git a/src/vnet/tcp/tcp.c b/src/vnet/tcp/tcp.c
index 4a0ffc137e5..dfcce771654 100644
--- a/src/vnet/tcp/tcp.c
+++ b/src/vnet/tcp/tcp.c
@@ -1281,14 +1281,7 @@ tcp_session_send_params (transport_connection_t * trans_conn,
   /* This still works if fast retransmit is on */
   sp->tx_offset = tc->snd_nxt - tc->snd_una;
 
-  sp->flags = 0;
-  if (!tc->snd_wnd)
-    {
-      if (tcp_timer_is_active (tc, TCP_TIMER_PERSIST))
-	sp->flags = TRANSPORT_SND_F_DESCHED;
-      else
-	sp->flags = TRANSPORT_SND_F_POSTPONE;
-    }
+  sp->flags = sp->snd_space ? 0 : TRANSPORT_SND_F_DESCHED;
 
   return 0;
 }
@@ -1540,6 +1533,13 @@ tcp_connection_tx_pacer_reset (tcp_connection_t * tc, u32 window,
 				       srtt * CLIB_US_TIME_FREQ);
 }
 
+void
+tcp_reschedule (tcp_connection_t * tc)
+{
+  if (tcp_in_cong_recovery (tc) || tcp_snd_space_inline (tc))
+    transport_connection_reschedule (&tc->connection);
+}
+
 static void
 tcp_expired_timers_dispatch (u32 * expired_timers)
 {
diff --git a/src/vnet/tcp/tcp.h b/src/vnet/tcp/tcp.h
index 8fa9013e31a..4db6040ae64 100644
--- a/src/vnet/tcp/tcp.h
+++ b/src/vnet/tcp/tcp.h
@@ -1036,6 +1036,12 @@ tcp_available_cc_snd_space (const tcp_connection_t * tc)
   return available_wnd - flight_size;
 }
 
+static inline u8
+tcp_is_descheduled (tcp_connection_t * tc)
+{
+  return (transport_connection_is_descheduled (&tc->connection) ? 1 : 0);
+}
+
 always_inline u8
 tcp_is_lost_fin (tcp_connection_t * tc)
 {
@@ -1046,6 +1052,7 @@ tcp_is_lost_fin (tcp_connection_t * tc)
 
 u32 tcp_snd_space (tcp_connection_t * tc);
 int tcp_fastrecovery_prr_snd_space (tcp_connection_t * tc);
+void tcp_reschedule (tcp_connection_t * tc);
 
 fib_node_index_t tcp_lookup_rmt_in_fib (tcp_connection_t * tc);
 
@@ -1244,8 +1251,6 @@ tcp_persist_timer_update (tcp_connection_t * tc)
 always_inline void
 tcp_persist_timer_reset (tcp_connection_t * tc)
 {
-  if (transport_connection_is_descheduled (&tc->connection))
-    transport_connection_reschedule (&tc->connection);
   tcp_timer_reset (tc, TCP_TIMER_PERSIST);
 }
 
diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c
index 4f31d21c3c1..bac41473cfa 100755
--- a/src/vnet/tcp/tcp_input.c
+++ b/src/vnet/tcp/tcp_input.c
@@ -700,6 +700,9 @@ tcp_handle_postponed_dequeues (tcp_worker_ctx_t * wrk)
 	    tc->flags &= ~TCP_CONN_PSH_PENDING;
 	}
 
+      if (tcp_is_descheduled (tc))
+	tcp_reschedule (tc);
+
       /* If everything has been acked, stop retransmit timer
        * otherwise update. */
       tcp_retransmit_timer_update (tc);
@@ -1315,6 +1318,9 @@ tcp_update_snd_wnd (tcp_connection_t * tc, u32 seq, u32 ack, u32 snd_wnd)
 	  if (PREDICT_FALSE (tcp_timer_is_active (tc, TCP_TIMER_PERSIST)))
 	    tcp_persist_timer_reset (tc);
 
+	  if (PREDICT_FALSE (tcp_is_descheduled (tc)))
+	    tcp_reschedule (tc);
+
 	  if (PREDICT_FALSE (!tcp_in_recovery (tc) && tc->rto_boff > 0))
 	    {
 	      tc->rto_boff = 0;
@@ -1465,6 +1471,7 @@ tcp_cc_recover (tcp_connection_t * tc)
   ASSERT (tc->rto_boff == 0);
   ASSERT (!tcp_in_cong_recovery (tc));
   ASSERT (tcp_scoreboard_is_sane_post_recovery (tc));
+
   return is_spurious;
 }
 
diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c
index b77713e1538..d33cbdd4ad4 100644
--- a/src/vnet/tcp/tcp_output.c
+++ b/src/vnet/tcp/tcp_output.c
@@ -1695,9 +1695,11 @@ tcp_timer_persist_handler (tcp_connection_t * tc)
   /* Just sent new data, enable retransmit */
   tcp_retransmit_timer_update (tc);
 
+  return;
+
 update_scheduler:
 
-  if (transport_connection_is_descheduled (&tc->connection))
+  if (tcp_is_descheduled (tc))
     transport_connection_reschedule (&tc->connection);
 }