diff options
| author |   Xin Long <lucien.xin@gmail.com> | 2017-05-31 16:36:32 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-06-02 13:56:26 -0400 |
| commit | ff356414dc006170153c79434eb81d130c03beec (patch) | |
| tree | 55ec0eab1ade81782ef50358fb2ae2739c57251f /net/sctp/associola.c | |
| parent | sctp: define the member stream as an object instead of pointer in asoc (diff) | |
| download | linux-dev-ff356414dc006170153c79434eb81d130c03beec.tar.xz linux-dev-ff356414dc006170153c79434eb81d130c03beec.zip | |
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: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/sctp/associola.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 6625b15ab81a..288c5e0cda5d 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -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 |