From: Greg Kroah-Hartman Date: Tue, 12 Mar 2024 18:24:31 +0000 (+0100) Subject: fixed up 5.15 and 6.1 queues X-Git-Tag: v6.8.1~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a83d0633d786b371d27c81fbfb95ca67eb6dd943;p=thirdparty%2Fkernel%2Fstable-queue.git fixed up 5.15 and 6.1 queues --- diff --git a/queue-5.15/selftests-mptcp-decrease-bw-in-simult-flows.patch b/queue-5.15/selftests-mptcp-decrease-bw-in-simult-flows.patch index 7a5c1d036f3..b5e72b924b8 100644 --- a/queue-5.15/selftests-mptcp-decrease-bw-in-simult-flows.patch +++ b/queue-5.15/selftests-mptcp-decrease-bw-in-simult-flows.patch @@ -24,14 +24,12 @@ Link: https://lore.kernel.org/r/20240131-upstream-net-20240131-mptcp-ci-issues-v Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- - tools/testing/selftests/net/mptcp/simult_flows.sh | 8 ++++---- + tools/testing/selftests/net/mptcp/simult_flows.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh -index d41fcd9f4ba76..af5f4ae48f7ea 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh -@@ -291,12 +291,12 @@ done +@@ -289,10 +289,10 @@ done setup run_test 10 10 0 0 "balanced bwidth" @@ -45,9 +43,4 @@ index d41fcd9f4ba76..af5f4ae48f7ea 100755 +run_test 10 3 0 0 "unbalanced bwidth" +run_test 10 3 1 25 "unbalanced bwidth with unbalanced delay" +run_test 10 3 25 1 "unbalanced bwidth with opposed, unbalanced delay" - - mptcp_lib_result_print_all_tap exit $ret --- -2.43.0 - diff --git a/queue-6.1/selftests-mptcp-decrease-bw-in-simult-flows.patch b/queue-6.1/selftests-mptcp-decrease-bw-in-simult-flows.patch index 7e62dd591d6..6c78bcb913c 100644 --- a/queue-6.1/selftests-mptcp-decrease-bw-in-simult-flows.patch +++ b/queue-6.1/selftests-mptcp-decrease-bw-in-simult-flows.patch @@ -1,4 +1,4 @@ -From 29eb96441917da2cf892c37a0d2fb87ceabfed17 Mon Sep 17 00:00:00 2001 +From 4932a188b9e196bd115dffbb465723c9f1effcb4 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 31 Jan 2024 22:49:51 +0100 Subject: selftests: mptcp: decrease BW in simult flows @@ -24,14 +24,12 @@ Link: https://lore.kernel.org/r/20240131-upstream-net-20240131-mptcp-ci-issues-v Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- - tools/testing/selftests/net/mptcp/simult_flows.sh | 8 ++++---- + tools/testing/selftests/net/mptcp/simult_flows.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh -index 6b0014f538a22..6bda70af03a83 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh -@@ -303,12 +303,12 @@ done +@@ -301,10 +301,10 @@ done setup run_test 10 10 0 0 "balanced bwidth" @@ -45,9 +43,4 @@ index 6b0014f538a22..6bda70af03a83 100755 +run_test 10 3 0 0 "unbalanced bwidth" +run_test 10 3 1 25 "unbalanced bwidth with unbalanced delay" +run_test 10 3 25 1 "unbalanced bwidth with opposed, unbalanced delay" - - mptcp_lib_result_print_all_tap exit $ret --- -2.43.0 -