diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 09:23:50 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 09:23:50 +0100 |
commit | d3086550faea48d87343b34aca15be853ea79f96 (patch) | |
tree | d46c65d203c6b1b7ab7e55e91211cd622d8b4479 /net/sctp/sm_make_chunk.c | |
parent | 7146a4f02635fe1b0791ce818176b1cf6b3d8a85 (diff) | |
parent | 40e020c129cfc991e8ab4736d2665351ffd1468d (diff) | |
download | linux-next-d3086550faea48d87343b34aca15be853ea79f96.tar.gz |
Merge 4.20-rc6 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sctp/sm_make_chunk.c')
-rw-r--r-- | net/sctp/sm_make_chunk.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 4a4fd1971255..f4ac6c592e13 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -2462,6 +2462,9 @@ int sctp_process_init(struct sctp_association *asoc, struct sctp_chunk *chunk, asoc->c.sinit_max_instreams, gfp)) goto clean_up; + /* Update frag_point when stream_interleave may get changed. */ + sctp_assoc_update_frag_point(asoc); + if (!asoc->temp && sctp_assoc_set_id(asoc, gfp)) goto clean_up; |