diff options
| author | Xin Long <lucien.xin@gmail.com> | 2021-05-02 22:36:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-05-03 22:30:04 +0200 |
| commit | 7aa4e54739be1471d8dd78f3c0148164085bdc20 (patch) | |
| tree | 67326d26be0f34e89364ae82815ec6de6da3bdf9 /net | |
| parent | Revert "Revert "sctp: Fix bundling of SHUTDOWN with COOKIE-ACK"" (diff) | |
| download | linux-7aa4e54739be1471d8dd78f3c0148164085bdc20.tar.xz linux-7aa4e54739be1471d8dd78f3c0148164085bdc20.zip | |
Revert "sctp: Fix SHUTDOWN CTSN Ack in the peer restart case"
This reverts commit 12dfd78e3a74825e6f0bc8df7ef9f938fbc6bfe3.
This can be reverted as shutdown and cookie_ack chunk are using the
same asoc since commit 35b4f24415c8 ("sctp: do asoc update earlier
in sctp_sf_do_dupcook_a").
Reported-by: Jere Leppänen <jere.leppanen@nokia.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sctp/sm_make_chunk.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 5f9a7c028274..5b44d228b6ca 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -858,11 +858,7 @@ struct sctp_chunk *sctp_make_shutdown(const struct sctp_association *asoc, struct sctp_chunk *retval; __u32 ctsn; - if (chunk && chunk->asoc) - ctsn = sctp_tsnmap_get_ctsn(&chunk->asoc->peer.tsn_map); - else - ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map); - + ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map); shut.cum_tsn_ack = htonl(ctsn); retval = sctp_make_control(asoc, SCTP_CID_SHUTDOWN, 0, |