Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2ee8131 authored by Xin Long's avatar Xin Long Committed by Greg Kroah-Hartman
Browse files

sctp: shrink stream outq only when new outcnt < old outcnt 



[ Upstream commit 8f13399db22f909a35735bf8ae2f932e0c8f0e30 ]

It's not necessary to go list_for_each for outq->out_chunk_list
when new outcnt >= old outcnt, as no chunk with higher sid than
new (outcnt - 1) exists in the outqueue.

While at it, also move the list_for_each code in a new function
sctp_stream_shrink_out(), which will be used in the next patch.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f0965dc9

net/sctp/stream.c

+14 −7
Original line number Diff line number Diff line
@@ -97,17 +97,11 @@ static size_t fa_index(struct flex_array *fa, void *elem, size_t count) 
	return index;

}



/* Migrates chunks from stream queues to new stream queues if needed,

 * but not across associations. Also, removes those chunks to streams

 * higher than the new max.

 */

static void sctp_stream_outq_migrate(struct sctp_stream *stream,

				     struct sctp_stream *new, __u16 outcnt)

static void sctp_stream_shrink_out(struct sctp_stream *stream, __u16 outcnt)

{

	struct sctp_association *asoc;

	struct sctp_chunk *ch, *temp;

	struct sctp_outq *outq;

	int i;



	asoc = container_of(stream, struct sctp_association, stream);

	outq = &asoc->outqueue;
@@ -131,6 +125,19 @@ static void sctp_stream_outq_migrate(struct sctp_stream *stream, 


		sctp_chunk_free(ch);

	}

}



/* Migrates chunks from stream queues to new stream queues if needed,

 * but not across associations. Also, removes those chunks to streams

 * higher than the new max.

 */

static void sctp_stream_outq_migrate(struct sctp_stream *stream,

				     struct sctp_stream *new, __u16 outcnt)

{

	int i;



	if (stream->outcnt > outcnt)

		sctp_stream_shrink_out(stream, outcnt);



	if (new) {

		/* Here we actually move the old ext stuff into the new