Skip to content

Commit 7aa4e54

Browse files
lxindavem330
authored andcommitted
Revert "sctp: Fix SHUTDOWN CTSN Ack in the peer restart case"
This reverts commit 12dfd78. This can be reverted as shutdown and cookie_ack chunk are using the same asoc since commit 35b4f24 ("sctp: do asoc update earlier in sctp_sf_do_dupcook_a"). Reported-by: Jere Leppänen <[email protected]> Signed-off-by: Xin Long <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 22008f5 commit 7aa4e54

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

net/sctp/sm_make_chunk.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -858,11 +858,7 @@ struct sctp_chunk *sctp_make_shutdown(const struct sctp_association *asoc,
858858
struct sctp_chunk *retval;
859859
__u32 ctsn;
860860

861-
if (chunk && chunk->asoc)
862-
ctsn = sctp_tsnmap_get_ctsn(&chunk->asoc->peer.tsn_map);
863-
else
864-
ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map);
865-
861+
ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map);
866862
shut.cum_tsn_ack = htonl(ctsn);
867863

868864
retval = sctp_make_control(asoc, SCTP_CID_SHUTDOWN, 0,

0 commit comments

Comments
 (0)