From 68f03d19ebc4456f9067b61e06ac0c544088b273 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 4 Mar 2024 10:32:11 +0100 Subject: [PATCH] drop queue-5.15/mptcp-fix-snd_wnd-initialization-for-passive-socket.patch --- ...nd-initialization-for-passive-socket.patch | 35 ------------------- queue-5.15/series | 1 - 2 files changed, 36 deletions(-) delete mode 100644 queue-5.15/mptcp-fix-snd_wnd-initialization-for-passive-socket.patch diff --git a/queue-5.15/mptcp-fix-snd_wnd-initialization-for-passive-socket.patch b/queue-5.15/mptcp-fix-snd_wnd-initialization-for-passive-socket.patch deleted file mode 100644 index e9e7fcd6e08..00000000000 --- a/queue-5.15/mptcp-fix-snd_wnd-initialization-for-passive-socket.patch +++ /dev/null @@ -1,35 +0,0 @@ -From adf1bb78dab55e36d4d557aa2fb446ebcfe9e5ce Mon Sep 17 00:00:00 2001 -From: Paolo Abeni -Date: Fri, 23 Feb 2024 17:14:15 +0100 -Subject: mptcp: fix snd_wnd initialization for passive socket - -From: Paolo Abeni - -commit adf1bb78dab55e36d4d557aa2fb446ebcfe9e5ce upstream. - -Such value should be inherited from the first subflow, but -passive sockets always used 'rsk_rcv_wnd'. - -Fixes: 6f8a612a33e4 ("mptcp: keep track of advertised windows right edge") -Cc: stable@vger.kernel.org -Signed-off-by: Paolo Abeni -Reviewed-by: Mat Martineau -Signed-off-by: Matthieu Baerts (NGI0) -Link: https://lore.kernel.org/r/20240223-upstream-net-20240223-misc-fixes-v1-5-162e87e48497@kernel.org -Signed-off-by: Jakub Kicinski -Signed-off-by: Greg Kroah-Hartman ---- - net/mptcp/protocol.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/net/mptcp/protocol.c -+++ b/net/mptcp/protocol.c -@@ -2889,7 +2889,7 @@ struct sock *mptcp_sk_clone(const struct - msk->write_seq = subflow_req->idsn + 1; - msk->snd_nxt = msk->write_seq; - msk->snd_una = msk->write_seq; -- msk->wnd_end = msk->snd_nxt + req->rsk_rcv_wnd; -+ msk->wnd_end = msk->snd_nxt + tcp_sk(ssk)->snd_wnd; - msk->setsockopt_seq = mptcp_sk(sk)->setsockopt_seq; - - if (mp_opt->suboptions & OPTIONS_MPTCP_MPC) { diff --git a/queue-5.15/series b/queue-5.15/series index 3990b993b8a..0901fbe5366 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -67,5 +67,4 @@ selftests-mptcp-add-missing-kconfig-for-nf-filter-in-v6.patch mptcp-clean-up-harmless-false-expressions.patch mptcp-add-needs_id-for-netlink-appending-addr.patch mptcp-push-at-dss-boundaries.patch -mptcp-fix-snd_wnd-initialization-for-passive-socket.patch mptcp-fix-possible-deadlock-in-subflow-diag.patch -- 2.47.3