diff options
author | luigi <luigi@FreeBSD.org> | 2000-02-04 16:45:33 +0000 |
---|---|---|
committer | luigi <luigi@FreeBSD.org> | 2000-02-04 16:45:33 +0000 |
commit | b36ea4aac23a878b429f804ac855ae9a04925c30 (patch) | |
tree | 412ffad6574aac992483126c65c49626572d69e3 /sys/netinet | |
parent | 745c79d2bf774a9a57f41d9d4bbf166f3da303bb (diff) | |
download | FreeBSD-src-b36ea4aac23a878b429f804ac855ae9a04925c30.zip FreeBSD-src-b36ea4aac23a878b429f804ac855ae9a04925c30.tar.gz |
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
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/ip_dummynet.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c index 28e877a..911a8b4 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); } /* |