From ac9bce0f3bfa07a188c5ebecb755a268080944cc Mon Sep 17 00:00:00 2001 From: Michael Tuexen <tuexen@FreeBSD.org> Date: Mon, 26 Oct 2009 19:23:34 +0000 Subject: [PATCH] Improve the round robin stream scheduler. Approved by: rrs (mentor) MFC after: 3 days --- sys/netinet/sctp_output.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index a99fc691230a..02bca9044c81 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -7169,20 +7169,14 @@ sctp_select_a_stream(struct sctp_tcb *stcb, struct sctp_association *asoc) /* Find the next stream to use */ if (asoc->last_out_stream == NULL) { - strq = asoc->last_out_stream = TAILQ_FIRST(&asoc->out_wheel); - if (asoc->last_out_stream == NULL) { - /* huh nothing on the wheel, TSNH */ - return (NULL); + strq = TAILQ_FIRST(&asoc->out_wheel); + } else { + strq = TAILQ_NEXT(asoc->last_out_stream, next_spoke); + if (strq == NULL) { + strq = TAILQ_FIRST(&asoc->out_wheel); } - goto done_it; - } - strq = TAILQ_NEXT(asoc->last_out_stream, next_spoke); -done_it: - if (strq == NULL) { - strq = asoc->last_out_stream = TAILQ_FIRST(&asoc->out_wheel); } return (strq); - }