From nobody Mon Feb 9 04:03:43 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1894433jad; Fri, 18 Feb 2022 14:18:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJy6R6z0SAE6ROW4YCg2mosrM/R+DnBZABLCBkLgtJA/8afgtabvwZe5YKTOFWkrruPaT/N5 X-Received: by 2002:a17:902:7895:b0:14b:6b63:b3fa with SMTP id q21-20020a170902789500b0014b6b63b3famr9355145pll.156.1645222706654; Fri, 18 Feb 2022 14:18:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645222706; cv=none; d=google.com; s=arc-20160816; b=pP0s2tqb04ZGanEP5JP8W3loixmU7vbZaOHQfZDYNR9wVW82oPCk9eCTcCnznap9DH iEFORTwzheAvLBtd6KvHxKqLp+kB4hg88ydQS3DwrAJD2Noo+M9rhQVd12xa7uFNogmP B+QPtp5ZjioXbW0EGzFZjlH2H2aqJuaItaRt/bqlo0tb0jIqLSg5DQEf/lmHZSzabITP Y7f6AW7TIkMBHysjlJszjHiSgvBJiXQeVgN5TMt+DVro1QwOqxNFWUmMxjiqQN1l5XWc 5Hrz+VAYnRrLGRW4D7QYCI9FzrRX0e/nnpN4SRl52ylOrcF2+Ovtu+6gMVQ1UyaQp3H4 D3tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ThbX9n0fbPTuFl2wSZQ54qdFEIYAYeBqEgaIPz3QkT4=; b=vtpvyjObDa5hkTELUlTkcFDdh78JsuyJ0Nozf0RR9aaxmlM3bPHWAzevDUdpPcikzD ayBp1fvtf27ciUi6FMXMCt3QLkY4LUc/12XOtLkhf1MOAZ2KvxaVlefy8dlbhIfU0dxK yPBPcIJLi+gM+l5QwlB7h0gA2TR/FwSJ9opdfcpUDCaQWmbbt30D/fAcPvOm80E5p7dI opyI8DzW8TxEbOV/8C23ny/v6GUh+IEH1cIN7WKIuiE6gGTyOLz3W0x3UkZlVx3bEcOB 5ebONRUI0LHssHLg7o8TwMnxELaPFlHkdEEsOzjrjpSnB2hZaUr9xn/o6A19z5vyIdA0 aMqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XOmXbKBx; spf=pass (google.com: domain of mptcp+bounces-3869-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3869-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id l7si22843921plg.617.2022.02.18.14.18.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Feb 2022 14:18:26 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3869-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XOmXbKBx; spf=pass (google.com: domain of mptcp+bounces-3869-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3869-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 49D333E0EC6 for ; Fri, 18 Feb 2022 22:18:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9C6424C96; Fri, 18 Feb 2022 22:18:25 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 443ED4C9A for ; Fri, 18 Feb 2022 22:18:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645222704; x=1676758704; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qF8XU1D4MxIposN0eSHBiLKfhamU+44NYZuTsiWj4Yk=; b=XOmXbKBx21dOQxplt8IBWvnLK71uelllZ4+2qzD/psZ9R34bpkNVV8Uc aKh5gcV1Soy0goH2etksT1XeunR5zKRenetbr6Y01sLxMZweqEIScKWKJ AUPvpCvlt+US5Z/sdHMIxjM30KwUC/TvwULmy7Xmbh0dds1Wxrjamo8g+ AlbHzdx/0D35sUccE/bfz+MHJNK/fuJ2lwOjaeEy4h0WNR++upV5HpX6R S1WA6g65qdPS7hxBZdG88vrDqTgGzcrNWrmQQk96RPK7dvUWiEM1P0EGC X6KJ8moFBZZgEF/EXkkqkFjCkxM9MSeoSHyNEvWy6Zlp99GbLLrC2Xc1S A==; X-IronPort-AV: E=McAfee;i="6200,9189,10262"; a="231857987" X-IronPort-AV: E=Sophos;i="5.88,380,1635231600"; d="scan'208";a="231857987" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2022 14:18:22 -0800 X-IronPort-AV: E=Sophos;i="5.88,380,1635231600"; d="scan'208";a="542032035" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.65.242]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2022 14:18:22 -0800 From: Mat Martineau To: mptcp@lists.linux.dev Cc: Mat Martineau Subject: [PATCH mptcp-next 1/3] Squash to "selftests: mptcp: improve 'fair usage on close' stability" Date: Fri, 18 Feb 2022 14:18:12 -0800 Message-Id: <20220218221814.72026-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220218221814.72026-1-mathew.j.martineau@linux.intel.com> References: <20220218221814.72026-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" I modified the patch sent to -net upstream to remove this function rename, to avoid a net/net-next merge conflict. Rename is restored in a later patch. Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index b48b11714817..788aab602d8f 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1152,7 +1152,7 @@ chk_link_usage() fi } =20 -wait_attempt_fail() +wait_for_tw() { local timeout_ms=3D$((timeout_poll * 1000)) local time=3D0 @@ -1271,7 +1271,7 @@ subflows_error_tests() TEST_COUNT=3D$((TEST_COUNT+1)) =20 # mpj subflow will be in TW after the reset - wait_attempt_fail $ns2 + wait_for_tw $ns2 pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow wait =20 --=20 2.35.1