Fix a (mostly harmless) scheduling-in-the-past problem with

dummynet (already fixed in -stable, was waiting for Jordan's
approval due to the code freeze).

Reported-By: Mike Tancsa
Approved-By: Jordan

1 files changed, 6 insertions, 6 deletions

diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 28e877a9aa39..911a8b4f3704 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ip_dummynet.c
@@ -380,12 +380,6 @@ ready_event(struct dn_flow_queue *q)
         DN_NEXT(p->p.tail) = NULL;
     }
     /*
-     * If the delay line was empty call transmit_event(p) now.
-     * Otherwise, the scheduler will take care of it.
-     */
-    if (p_was_empty)
-	transmit_event(p);
-    /*
      * If we have more packets queued, schedule next ready event
      * (can only occur when bandwidth != 0, otherwise we would have
      * flushed the whole queue in the previous loop).
@@ -403,6 +397,12 @@ ready_event(struct dn_flow_queue *q)
 	 * queue on error hoping next time we are luckier.
 	 */
     }
+    /*
+     * If the delay line was empty call transmit_event(p) now.
+     * Otherwise, the scheduler will take care of it.
+     */
+    if (p_was_empty)
+	transmit_event(p);
 }
 
 /*