On Wed, Jan 18, 2023 at 12:14:58PM +0100, Sriram Yagnaraman wrote:
> This reverts commit (bff3d0534804: "netfilter: conntrack: add sctp
> DATA_SENT state")
>
> Using DATA/SACK to detect a new connection on secondary/alternate paths
> works only on new connections, while a HEARTBEAT is required on
> connection re-use. It is probably consistent to wait for HEARTBEAT to
> create a secondary connection in conntrack.
>
> Signed-off-by: Sriram Yagnaraman <sriram.yagnaraman@xxxxxxxx>
> ---
> .../uapi/linux/netfilter/nf_conntrack_sctp.h | 2 +-
> .../linux/netfilter/nfnetlink_cttimeout.h | 2 +-
> net/netfilter/nf_conntrack_proto_sctp.c | 102 ++++++++----------
> net/netfilter/nf_conntrack_standalone.c | 8 --
> 4 files changed, 44 insertions(+), 70 deletions(-)
>
> diff --git a/include/uapi/linux/netfilter/nf_conntrack_sctp.h b/include/uapi/linux/netfilter/nf_conntrack_sctp.h
> index c742469afe21..b90680f01e38 100644
> --- a/include/uapi/linux/netfilter/nf_conntrack_sctp.h
> +++ b/include/uapi/linux/netfilter/nf_conntrack_sctp.h
> @@ -16,7 +16,7 @@ enum sctp_conntrack {
> SCTP_CONNTRACK_SHUTDOWN_ACK_SENT,
> SCTP_CONNTRACK_HEARTBEAT_SENT,
> SCTP_CONNTRACK_HEARTBEAT_ACKED,
> - SCTP_CONNTRACK_DATA_SENT,
> + SCTP_CONNTRACK_DATA_SENT, /* no longer used */
For this case, given this has only shown up in 6.1-rc, I suggest we
can make an exception and simply remove SCTP_CONNTRACK_DATA_SENT.
