From: David S. Miller <davem@davemloft.net>
Date: Mon, 3 May 2021 20:30:04 +0000 (-0700)
Subject: Merge branch 'sctp-bad-revert'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a52445ae5a3a4cbfa6380583eea2abf997ae45d1;p=linux.git

Merge branch 'sctp-bad-revert'

Xin Long says:

====================
sctp: fix the incorrect revert

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").
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

a52445ae5a3a4cbfa6380583eea2abf997ae45d1