On Mon, Mar 04, 2024 at 10:00:01AM +0100, Matthieu Baerts wrote: > Hi Greg, > > On 04/03/2024 09:28, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > The patch below does not apply to the 5.4-stable tree. > > (...) > > > ------------------ original commit in Linus's tree ------------------ > > > > From b9cd26f640a308ea314ad23532de9a8592cd09d2 Mon Sep 17 00:00:00 2001 > > From: Paolo Abeni <pabeni@xxxxxxxxxx> > > Date: Fri, 23 Feb 2024 17:14:14 +0100 > > Subject: [PATCH] mptcp: push at DSS boundaries > > > > when inserting not contiguous data in the subflow write queue, > > the protocol creates a new skb and prevent the TCP stack from > > merging it later with already queued skbs by setting the EOR marker. > > > > Still no push flag is explicitly set at the end of previous GSO > > packet, making the aggregation on the receiver side sub-optimal - > > and packetdrill self-tests less predictable. > > > > Explicitly mark the end of not contiguous DSS with the push flag. > > > > Fixes: 6d0060f600ad ("mptcp: Write MPTCP DSS headers to outgoing data packets") > > I guess this patch has been selected for v5.4 by accident because MPTCP > has been introduced in v5.6. In other words, we don't need this patch > for v5.4 :) Oops, I read "5.6" as "5.4", my coffee hadn't kicked in yet, sorry. greg k-h