Commit ff356414 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: merge sctp_stream_new and sctp_stream_init 



Since last patch, sctp doesn't need to alloc memory for asoc->stream any
more. sctp_stream_new and sctp_stream_init both are used to alloc memory
for stream.in or stream.out, and their names are also confusing.

This patch is to merge them into sctp_stream_init, and only pass stream
and streamcnt parameters into it, instead of the whole asoc.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cee360ab

include/net/sctp/structs.h

+2 −2
Original line number Diff line number Diff line
@@ -377,8 +377,8 @@ typedef struct sctp_sender_hb_info { 
	__u64 hb_nonce;

} sctp_sender_hb_info_t;



int sctp_stream_new(struct sctp_association *asoc, gfp_t gfp);

int sctp_stream_init(struct sctp_association *asoc, gfp_t gfp);

int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt,

		     gfp_t gfp);

void sctp_stream_free(struct sctp_stream *stream);

void sctp_stream_clear(struct sctp_stream *stream);

void sctp_stream_update(struct sctp_stream *stream, struct sctp_stream *new);

net/sctp/associola.c

+2 −1
Original line number Diff line number Diff line
@@ -246,7 +246,8 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a 
	if (!sctp_ulpq_init(&asoc->ulpq, asoc))

		goto fail_init;



	if (sctp_stream_new(asoc, gfp))

	if (sctp_stream_init(&asoc->stream, asoc->c.sinit_num_ostreams,

			     0, gfp))

		goto fail_init;



	/* Assume that peer would support both address types unless we are

net/sctp/sm_make_chunk.c

+2 −1
Original line number Diff line number Diff line
@@ -2454,7 +2454,8 @@ int sctp_process_init(struct sctp_association *asoc, struct sctp_chunk *chunk, 
	 * stream sequence number shall be set to 0.

	 */



	if (sctp_stream_init(asoc, gfp))

	if (sctp_stream_init(&asoc->stream, asoc->c.sinit_num_ostreams,

			     asoc->c.sinit_max_instreams, gfp))

		goto clean_up;



	if (!asoc->temp && sctp_assoc_set_id(asoc, gfp))

net/sctp/stream.c

+11 −22
Original line number Diff line number Diff line
@@ -35,47 +35,36 @@ 
#include <net/sctp/sctp.h>

#include <net/sctp/sm.h>



int sctp_stream_new(struct sctp_association *asoc, gfp_t gfp)

int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt,

		     gfp_t gfp)

{

	struct sctp_stream *stream = &asoc->stream;

	int i;



	stream->outcnt = asoc->c.sinit_num_ostreams;

	stream->out = kcalloc(stream->outcnt, sizeof(*stream->out), gfp);

	if (!stream->out)

		return -ENOMEM;



	for (i = 0; i < stream->outcnt; i++)

		stream->out[i].state = SCTP_STREAM_OPEN;



	return 0;

}



int sctp_stream_init(struct sctp_association *asoc, gfp_t gfp)

{

	struct sctp_stream *stream = &asoc->stream;

	int i;



	/* Initial stream->out size may be very big, so free it and alloc

	 * a new one with new outcnt to save memory.

	 */

	kfree(stream->out);

	stream->outcnt = asoc->c.sinit_num_ostreams;

	stream->out = kcalloc(stream->outcnt, sizeof(*stream->out), gfp);



	stream->out = kcalloc(outcnt, sizeof(*stream->out), gfp);

	if (!stream->out)

		return -ENOMEM;



	stream->outcnt = outcnt;

	for (i = 0; i < stream->outcnt; i++)

		stream->out[i].state = SCTP_STREAM_OPEN;



	stream->incnt = asoc->c.sinit_max_instreams;

	stream->in = kcalloc(stream->incnt, sizeof(*stream->in), gfp);

	if (!incnt)

		return 0;



	stream->in = kcalloc(incnt, sizeof(*stream->in), gfp);

	if (!stream->in) {

		kfree(stream->out);

		stream->out = NULL;

		return -ENOMEM;

	}



	stream->incnt = incnt;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE