From owner-svn-src-stable-8@FreeBSD.ORG Sun Jan 17 17:43:35 2010 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61DEB106566C; Sun, 17 Jan 2010 17:43:35 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from mail-n.franken.de (drew.ipv6.franken.de [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa]) by mx1.freebsd.org (Postfix) with ESMTP id BD5278FC0A; Sun, 17 Jan 2010 17:43:34 +0000 (UTC) Received: from [IPv6:2002:508f:f5eb::224:36ff:feef:67d1] (unknown [IPv6:2002:508f:f5eb:0:224:36ff:feef:67d1]) by mail-n.franken.de (Postfix) with ESMTP id 706241C0C0BC5; Sun, 17 Jan 2010 18:43:33 +0100 (CET) Mime-Version: 1.0 (Apple Message framework v1077) Content-Type: text/plain; charset=us-ascii From: Michael Tuexen In-Reply-To: <201001171741.o0HHfhdk096920@svn.freebsd.org> Date: Sun, 17 Jan 2010 18:43:32 +0100 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201001171741.o0HHfhdk096920@svn.freebsd.org> To: Michael Tuexen X-Mailer: Apple Mail (2.1077) 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 X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jan 2010 17:43:35 -0000 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 >=20 > Log: > MFC 197341 >=20 > Fix errnos. >=20 > 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) >=20 > Modified: stable/8/sys/netinet/sctp_output.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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 =3D=3D 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 =3D TAILQ_FIRST(&asoc->out_wheel); > - if (stre =3D=3D NULL) { > - /* only one on wheel */ > - TAILQ_INSERT_HEAD(&asoc->out_wheel, strq, next_spoke); > - goto outof_here; > - } > - for (; stre; stre =3D strn) { > - strn =3D 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 =3D=3D strq->stream_no) { > - /* huh, should not happen */ > - goto outof_here; > - } else if (strn =3D=3D 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 =3D=3D 0) { > SCTP_TCB_SEND_UNLOCK(stcb); > @@ -7197,8 +7176,6 @@ sctp_select_a_stream(struct sctp_tcb *st > strq =3D TAILQ_FIRST(&asoc->out_wheel); > } > } > - /* Save off the last stream */ > - asoc->last_out_stream =3D strq; > return (strq); > } >=20 > @@ -7274,7 +7251,9 @@ sctp_fill_outqueue(struct sctp_tcb *stcb > bail =3D 0; > moved_how_much =3D sctp_move_to_outqueue(stcb, net, = strq, goal_mtu, frag_point, &locked, > &giveup, eeor_mode, &bail); > - asoc->last_out_stream =3D strq; > + if (moved_how_much) > + asoc->last_out_stream =3D strq; > + > if (locked) { > asoc->locked_on_sending =3D strq; > if ((moved_how_much =3D=3D 0) || (giveup) || = bail) >=20