From: Paolo Abeni Date: Thu, 1 Aug 2024 10:30:15 +0000 (+0200) Subject: Merge branch 'mptcp-fix-duplicate-data-handling' X-Git-Tag: v6.11-rc2~28^2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=25010bfdf8bbedc64c5c04d18f846412f5367d26;p=linux-block.git Merge branch 'mptcp-fix-duplicate-data-handling' Matthieu Baerts says: ==================== mptcp: fix duplicate data handling In some cases, the subflow-level's copied_seq counter was incorrectly increased, leading to an unexpected subflow reset. Patch 1/2 fixes the RCVPRUNED MIB counter that was attached to the wrong event since its introduction in v5.14, backported to v5.11. Patch 2/2 fixes the copied_seq counter issues, is present since v5.10. Signed-off-by: Matthieu Baerts (NGI0) ==================== Link: https://patch.msgid.link/20240731-upstream-net-20240731-mptcp-dup-data-v1-0-bde833fa628a@kernel.org Signed-off-by: Paolo Abeni --- 25010bfdf8bbedc64c5c04d18f846412f5367d26