From: David S. Miller Date: Sat, 20 Nov 2021 14:24:00 +0000 (+0000) Subject: Merge branch 'mptcp-rtx-timer' X-Git-Tag: baikal/aarch64/sdk6.1~5202^2~50 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=11226df7adc1dcf067135cf0a5c342627b95582c;p=kernel.git Merge branch 'mptcp-rtx-timer' Paolo Abeni says: ==================== mptcp: fix 3rd ack rtx timer Eric noted that the MPTCP code do the wrong thing to schedule the MPJ 3rd ack timer. He also provided a patch to address the issues (patch 1/2). To fix for good the MPJ 3rd ack retransmission timer, we additionally need to set it after the current ack is transmitted (patch 2/2) Note that the bug went unnotice so far because all the related tests required some running data transfer, and that causes MPTCP-level ack even on the opening MPJ subflow. We now have explicit packet drill coverage for this code path. ==================== Signed-off-by: David S. Miller --- 11226df7adc1dcf067135cf0a5c342627b95582c