From nobody Tue May 7 08:00:29 2024 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 From nobody Tue May 7 08:00:29 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1894482jad; Fri, 18 Feb 2022 14:18:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJzghahV1LyfLvqMgjhmlo6hkdaiHk76J55EAk3FuL73h2QufpNK8rG52UmgCzCRJOgiEwZm X-Received: by 2002:a62:830e:0:b0:4c9:25cb:e1e with SMTP id h14-20020a62830e000000b004c925cb0e1emr9733622pfe.42.1645222711453; Fri, 18 Feb 2022 14:18:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645222711; cv=none; d=google.com; s=arc-20160816; b=01c5L90Q5Sje0lYNKf7k3PFhBroRySKBJzcOehFVngva3q3L6+ijFKwacEGIv9zMa5 +GHn5harG66iHs5gSIKoWOc9iOrrKm4xI5pYqaFwgjfeUu5Aqc/EUtNhDY2bBCRhoeYP E5thRfG0+ao9x3HbMKXCZx/IKWtSzed0H6si7LT+Nf4JVD+z9sHxkYnGTbeIlO6/uZ4V 7XrJgAmO6w6F0weR2ZcoZtITQgJ2uqV+BX+Sj8drvxh596dSQHcmh17+N/RbF9nYOphP Xe+zWdBiJdEm6vCLFZqbDKhCW9G3mE6GrfV527Rt7OirLnb4N/vIUUcwkRrHONRCEiY7 jqQQ== 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=L6uopYz93QM4TOyi7aPGCNCzkGVCW+gYHM4CE1C5LJ0=; b=PvGZjhAnI03wJECjo31ix3bsSG0yRghO15qMcRXtwTflQuub9IASVjIiWn5l3vL4g0 3cQSrfBLHCD0kHhwxmsM/aDnATzwbKxHpuVmoOu3NGZ8dpLDNJPBWw5FeteRSt3mwOyW oSX2omZVUxfzn2hNuzmVr5Pm1fTXY457126tgvDJQ3lAB712FGJkoeEp0bicPzxonjJ0 Lseufts0ZKf4tbNyFeAHh5x5SPoekJLXXoazukB35a/5gbWD+hek9REuU/Z2buDoXBuI JLmoN5HgbHfDrj8gJa8+trnkcTdBz5qstC3hP76PmiAf449d0wF0MaauWg9oDVSH0Vaj y46Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RLneeM1R; spf=pass (google.com: domain of mptcp+bounces-3870-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3870-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id s13si11237655plp.302.2022.02.18.14.18.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Feb 2022 14:18:31 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3870-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RLneeM1R; spf=pass (google.com: domain of mptcp+bounces-3870-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3870-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 ewr.edge.kernel.org (Postfix) with ESMTPS id ADDB01C0F0E for ; Fri, 18 Feb 2022 22:18:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D0DFC4C9A; 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 788FB3202 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=T/B9Pj8yDuo/9UxBM/mK6bRm5hNBhdRh6Ev6v3wHfiU=; b=RLneeM1RpekDiW3Rp/nnLGUPXyh9E4l46td9qtedAeCoP2NqCPu8MK4C GUJjyGG8682/JXZ+4CigF7okVGIeUEfo6zquCJW3JxHqWtk/ZnnZQmycL wMWuEwoRBlm3FlrdGl1IO3gqE6v+6dFHAfk5fWQ2FEvhpA50d2jbpgRhG cPkqu+JNEcWKn4BYJCHIkdlLHc8I/pY9qcPdm9xB98xCPQNSbOSs5htOU O/tePWeQq0rKOtkxLEryoTbz8IiIkUtVNBhrGyEeDbdjAEfrecyaUWGZL qrgJFIRBkBZii+r8PD+q83FYO17OiqukW2LB4f25ZcaqLz4nj4iSbVbeM w==; X-IronPort-AV: E=McAfee;i="6200,9189,10262"; a="231857988" X-IronPort-AV: E=Sophos;i="5.88,380,1635231600"; d="scan'208";a="231857988" 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="542032037" 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 2/3] Squash to "selftests: mptcp: more robust signal race test" Date: Fri, 18 Feb 2022 14:18:13 -0800 Message-Id: <20220218221814.72026-3-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" This removes a whitespace change to match what I upstreamed for -net. The patch will create a net/net-next merge conflict and removing this extra change from the commit makes the conflict resolution more obvious. Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 788aab602d8f..491934c3c489 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1346,7 +1346,6 @@ signal_address_tests() =20 # signal addresses race test reset - pm_nl_set_limits $ns1 4 4 pm_nl_set_limits $ns2 4 4 pm_nl_add_endpoint $ns1 10.0.1.1 flags signal --=20 2.35.1 From nobody Tue May 7 08:00:29 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1894488jad; Fri, 18 Feb 2022 14:18:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJzB/in8rG2KeARZa5xgQHnoeBL+C0swAZKdKeJCZJ12hOAfi55L6jIPLZYdmbdg/d2pU2Rf X-Received: by 2002:a17:902:eb8f:b0:14d:9bdb:b668 with SMTP id q15-20020a170902eb8f00b0014d9bdbb668mr9431612plg.69.1645222711811; Fri, 18 Feb 2022 14:18:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645222711; cv=none; d=google.com; s=arc-20160816; b=GnOUwa+ezwP8gjlz4zTjodL9iVHdHc/YoQnonZN90ZVCOjGcUJcnSIEZEQ42eykbZm WTY0ATpbllHlfD/k9qjd3BBCfIGTG0k7FXJoC1R4uNEHXfNn1cLmhZ3miLg4+Muvy8aM BPwdgdbUlOSXS4gJIVn6Itsp5zZhq5Z2Xte68KHIH7Sa47zVmQ38tAizDaeQEJ/lmT0e 6qxY5+u3m2DOoIOp6RrlRFPo7rv7WuAkb8qKdpQHyT1njnMprD06Zs7nZU7JrlNxwGTQ Lu9iR2AIsZgRA4YO2X4++kTMirm3IwSDwk/vPyoa4/vYNYMgv4lfPGZQpmZLTeaeVs0E D34A== 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=2tMHGYOtke1bHoOpjGRv8abeEAJ6XzRsScZwhypnCfk=; b=pXf+1sWIyZSnZsr0aVt+pVpXVEECsbGim8lXThA5eoA3HCqw6/J2IBefirOM2EQF3O Sic909gqHQioHf2ZL2yhj5HqpAuDw9BIuCcm1UPEwSqbQW8dZ7CkXoq02F1SChana++s 8eVGsXCA0sLEkE0vSCfAkaHDCqfnwj33z/vnDOBKfWAQ5QrfimCWgEjpi4sEPnoIpvGi q6oR7gHzHnRX4p8MhZrS8Qwo0U7urTsNkJBT5nozZ479HdDyoY1nFsRK7obk2n4xaofc y7zL8cCY3lXitGJVM7MoFjr/fIcwXBQ+D8w39qPCRTBg1o88mfP/4ZkJkN56+i3qKnSI 1wMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=iBSJjEy2; spf=pass (google.com: domain of mptcp+bounces-3871-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3871-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id o6si3276855pgq.694.2022.02.18.14.18.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Feb 2022 14:18:31 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3871-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=iBSJjEy2; spf=pass (google.com: domain of mptcp+bounces-3871-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3871-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 ewr.edge.kernel.org (Postfix) with ESMTPS id BCEB61C0ECA for ; Fri, 18 Feb 2022 22:18:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B34F04C99; Fri, 18 Feb 2022 22:18:26 +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 A5E004C9B for ; Fri, 18 Feb 2022 22:18:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645222705; x=1676758705; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=V8BE8auzhPjcsNv55FjAz+I3qbU9pXHfmig7YP34otQ=; b=iBSJjEy2RaD0exsTMdiGLR3hLcmXqdQYg3YsG9KmCMEG5shhK3mmY3Uc CdRQgqbammhUW2C2nzIlJjVA/Fh5q2YHBZedn69unf8niyj4+VscVeScJ mhuHcjt9JsR9eEpnr3jPCeJ8TChj5TycYrCvufbDRsR6nn9rqm1FOwLKm FMgnLi2sHBODPSyRRwFgwbF0kdYghj2Yst2hT0CIvv+zUiTU4zQKQtWrK vdFzpqRd2rF82LyGTAbCY8MfyyAWZNL2sPEjoYskVPp/wXL55nzg+G5T+ zXk75YSmXmmUFoCRXeX21DNn2sMZnwl0YsDhy+3Hv7gcNt01eZDnluCOm Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10262"; a="231857989" X-IronPort-AV: E=Sophos;i="5.88,380,1635231600"; d="scan'208";a="231857989" 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="542032039" 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 , Paolo Abeni Subject: [PATCH mptcp-next 3/3] selftests: mptcp: Rename wait function Date: Fri, 18 Feb 2022 14:18:14 -0800 Message-Id: <20220218221814.72026-4-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" The "selftests: mptcp: improve 'fair usage on close' stability" commit changed that self test to check the TcpAttemptFails MIB instead of looking for TW sockets. The associated bash function wasn't renamed in that commit because of the merge conflicts it would cause, so this commit updates the function name as Paolo originally intended. Cc: Paolo Abeni 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 491934c3c489..71b2ad5adefc 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_for_tw() +wait_attempt_fail() { 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_for_tw $ns2 + wait_attempt_fail $ns2 pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow wait =20 --=20 2.35.1