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
This commit is contained in:
luigi 2000-02-04 16:45:33 +00:00
parent 745c79d2bf
commit b36ea4aac2

View File

@ -379,12 +379,6 @@ ready_event(struct dn_flow_queue *q)
p->p.tail = pkt;
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
@ -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);
}
/*