Date: Sun, 17 Jan 2010 18:43:32 +0100 From: Michael Tuexen <tuexen@fh-muenster.de> To: Michael Tuexen <tuexen@FreeBSD.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r202496 - stable/8/sys/netinet Message-ID: <AE2B2E95-F924-40B8-8265-31D017E1DDA2@fh-muenster.de> In-Reply-To: <201001171741.o0HHfhdk096920@svn.freebsd.org> References: <201001171741.o0HHfhdk096920@svn.freebsd.org>
index | next in thread | previous in thread | raw e-mail
Actually a wrong commit message: Should have been: MFC 197856 Fix so that round robing stream scheduling works as advertised Best regards Michael On Jan 17, 2010, at 6:41 PM, Michael Tuexen wrote: > Author: tuexen > Date: Sun Jan 17 17:41:43 2010 > New Revision: 202496 > URL: http://svn.freebsd.org/changeset/base/202496 > > Log: > MFC 197341 > > Fix errnos. > > Modified: > stable/8/sys/netinet/sctp_output.c > Directory Properties: > stable/8/sys/ (props changed) > stable/8/sys/amd64/include/xen/ (props changed) > stable/8/sys/cddl/contrib/opensolaris/ (props changed) > stable/8/sys/contrib/dev/acpica/ (props changed) > stable/8/sys/contrib/pf/ (props changed) > stable/8/sys/dev/xen/xenpci/ (props changed) > > Modified: stable/8/sys/netinet/sctp_output.c > ============================================================================== > --- stable/8/sys/netinet/sctp_output.c Sun Jan 17 17:40:31 2010 (r202495) > +++ stable/8/sys/netinet/sctp_output.c Sun Jan 17 17:41:43 2010 (r202496) > @@ -5602,8 +5602,6 @@ sctp_insert_on_wheel(struct sctp_tcb *st > struct sctp_association *asoc, > struct sctp_stream_out *strq, int holds_lock) > { > - struct sctp_stream_out *stre, *strn; > - > if (holds_lock == 0) { > SCTP_TCB_SEND_LOCK(stcb); > } > @@ -5612,26 +5610,7 @@ sctp_insert_on_wheel(struct sctp_tcb *st > /* already on wheel */ > goto outof_here; > } > - stre = TAILQ_FIRST(&asoc->out_wheel); > - if (stre == NULL) { > - /* only one on wheel */ > - TAILQ_INSERT_HEAD(&asoc->out_wheel, strq, next_spoke); > - goto outof_here; > - } > - for (; stre; stre = strn) { > - strn = TAILQ_NEXT(stre, next_spoke); > - if (stre->stream_no > strq->stream_no) { > - TAILQ_INSERT_BEFORE(stre, strq, next_spoke); > - goto outof_here; > - } else if (stre->stream_no == strq->stream_no) { > - /* huh, should not happen */ > - goto outof_here; > - } else if (strn == NULL) { > - /* next one is null */ > - TAILQ_INSERT_AFTER(&asoc->out_wheel, stre, strq, > - next_spoke); > - } > - } > + TAILQ_INSERT_TAIL(&asoc->out_wheel, strq, next_spoke); > outof_here: > if (holds_lock == 0) { > SCTP_TCB_SEND_UNLOCK(stcb); > @@ -7197,8 +7176,6 @@ sctp_select_a_stream(struct sctp_tcb *st > strq = TAILQ_FIRST(&asoc->out_wheel); > } > } > - /* Save off the last stream */ > - asoc->last_out_stream = strq; > return (strq); > } > > @@ -7274,7 +7251,9 @@ sctp_fill_outqueue(struct sctp_tcb *stcb > bail = 0; > moved_how_much = sctp_move_to_outqueue(stcb, net, strq, goal_mtu, frag_point, &locked, > &giveup, eeor_mode, &bail); > - asoc->last_out_stream = strq; > + if (moved_how_much) > + asoc->last_out_stream = strq; > + > if (locked) { > asoc->locked_on_sending = strq; > if ((moved_how_much == 0) || (giveup) || bail) >help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AE2B2E95-F924-40B8-8265-31D017E1DDA2>