commit 35b4f24415c8 ("sctp: do asoc update earlier in sctp_sf_do_dupcook_a") only keeps the SHUTDOWN and COOKIE-ACK with the same asoc, not transport. So instead of revert commit 145cb2f7177d ("sctp: Fix bundling of SHUTDOWN with COOKIE-ACK"), we should revert 12dfd78e3a74 ("sctp: Fix SHUTDOWN CTSN Ack in the peer restart case"). Xin Long (2): Revert "Revert "sctp: Fix bundling of SHUTDOWN with COOKIE-ACK"" Revert "sctp: Fix SHUTDOWN CTSN Ack in the peer restart case" net/sctp/sm_make_chunk.c | 6 +----- net/sctp/sm_statefuns.c | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) -- 2.1.0