diff options
| author | David S. Miller <davem@davemloft.net> | 2021-05-03 13:30:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-05-03 13:30:04 -0700 |
| commit | a52445ae5a3a4cbfa6380583eea2abf997ae45d1 (patch) | |
| tree | 67326d26be0f34e89364ae82815ec6de6da3bdf9 /net/hsr/hsr_forward.c | |
| parent | 643001b47adc844ae33510c4bb93c236667008a3 (diff) | |
| parent | 7aa4e54739be1471d8dd78f3c0148164085bdc20 (diff) | |
| download | linux-a52445ae5a3a4cbfa6380583eea2abf997ae45d1.tar.bz2 | |
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>
Diffstat (limited to 'net/hsr/hsr_forward.c')
0 files changed, 0 insertions, 0 deletions