Merge branch 'sctp-bad-revert'

Browse source

Xin Long says:

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

commit 35b4f24415 ("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 145cb2f717 ("sctp: Fix bundling
of SHUTDOWN with COOKIE-ACK"), we should revert 12dfd78e3a
("sctp: Fix SHUTDOWN CTSN Ack in the peer restart case").
====================

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

...

This commit is contained in:

David S. Miller 2021-05-03 13:30:04 -07:00

parent 643001b47a 7aa4e54739

commit a52445ae5a

2 changed files with 4 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

net/sctp/sm_make_chunk.c

View file

6

net/sctp/sm_statefuns.c

View file