From: Paolo Abeni Date: Thu, 30 Jan 2025 13:02:21 +0000 (+0100) Subject: Merge branch 'mptcp-blackhole-only-if-1st-syn-retrans-w-o-mpc-is-accepted' X-Git-Tag: v6.14-rc1~33^2~4 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=047558caf7e502fe5babe9b85008950731d0e2d3;p=linux-2.6-block.git Merge branch 'mptcp-blackhole-only-if-1st-syn-retrans-w-o-mpc-is-accepted' Matthieu Baerts says: ==================== mptcp: blackhole only if 1st SYN retrans w/o MPC is accepted Here are two small fixes for issues introduced in v6.12. - Patch 1: reset the mpc_drop mark for other SYN retransmits, to only consider an MPTCP blackhole when the first SYN retransmitted without the MPTCP options is accepted, as initially intended. - Patch 2: also mention in the doc that the blackhole_timeout sysctl knob is per-netns, like all the others. Signed-off-by: Matthieu Baerts (NGI0) ==================== Link: https://patch.msgid.link/20250129-net-mptcp-blackhole-fix-v1-0-afe88e5a6d2c@kernel.org Signed-off-by: Paolo Abeni --- 047558caf7e502fe5babe9b85008950731d0e2d3