Commit 9f0b7732 authored by Xin Long's avatar Xin Long Committed by Jakub Kicinski
Browse files

sctp: remove the unnecessary sinfo_stream check in sctp_prsctp_prune_unsent 



Since commit 5bbbbe32 ("sctp: introduce stream scheduler foundations"),
sctp_stream_outq_migrate() has been called in sctp_stream_init/update to
removes those chunks to streams higher than the new max. There is no longer
need to do such check in sctp_prsctp_prune_unsent().

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1c075b19

net/sctp/outqueue.c

+3 −5
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ static int sctp_prsctp_prune_unsent(struct sctp_association *asoc, 
{

	struct sctp_outq *q = &asoc->outqueue;

	struct sctp_chunk *chk, *temp;

	struct sctp_stream_out *sout;



	q->sched->unsched_all(&asoc->stream);
@@ -398,12 +399,9 @@ static int sctp_prsctp_prune_unsent(struct sctp_association *asoc, 
		sctp_sched_dequeue_common(q, chk);

		asoc->sent_cnt_removable--;

		asoc->abandoned_unsent[SCTP_PR_INDEX(PRIO)]++;

		if (chk->sinfo.sinfo_stream < asoc->stream.outcnt) {

			struct sctp_stream_out *streamout =

				SCTP_SO(&asoc->stream, chk->sinfo.sinfo_stream);



			streamout->ext->abandoned_unsent[SCTP_PR_INDEX(PRIO)]++;

		}

		sout = SCTP_SO(&asoc->stream, chk->sinfo.sinfo_stream);

		sout->ext->abandoned_unsent[SCTP_PR_INDEX(PRIO)]++;



		msg_len -= chk->skb->truesize + sizeof(struct sctp_chunk);

		sctp_chunk_free(chk);