From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CFFE441B5F; Fri, 18 Aug 2023 04:54:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B4D2E43288; Fri, 18 Aug 2023 04:53:16 +0200 (CEST) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mails.dpdk.org (Postfix) with ESMTP id 33E8E43276 for ; Fri, 18 Aug 2023 04:53:11 +0200 (CEST) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-26814e27a9eso332560a91.0 for ; Thu, 17 Aug 2023 19:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327190; x=1692931990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fREpg+5p1kGXcqExd41cgj50m998TkQbF0biOt69Io4=; b=FAxZzF0ZneUcZpce3/Kh9lVXJ6ECDGiRRp3IOeVO5crZTEwMsFajN+mZ7JW+m+8Tfr 2vhnPAEKBdjWV0UHfg1Pj7tLvmrNnfN2rztpXIGAQgDw4eAVlW5F7pVHgiZ7fUE5yA2D lnu2OW3+HrGnWeDgBEtuZaRis1CVa7Qj+JyUpft6pZQS6aceMkkRnsr1bFlUdzRXpEh2 xnm45Le4NEjGv+C8hMX4Sm0tNxCYqjh2vjdLam7c1mK8ukmSn+KeXI+5VTBt8FpSR0GI zDAaoJB5uM2lFCQB15uxQz93Rw/U5qOX9HIjf7pUTASj5YH3UqxjQoLyotamV3uBJs6K ojMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327190; x=1692931990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fREpg+5p1kGXcqExd41cgj50m998TkQbF0biOt69Io4=; b=aVi+1ZcxbmeTqiLkpDMr5di6A/4+EFysgZ5PdcN7/0Qr92UYxxghdzluB7uytNfgWy GpORXuz8p8jyC5ihm2z4LQ+bO39qRpk0JkK0wCc1AOVrGzqp+UDiV8kGkHG8Eg/9uWWY 6a6LIOiZlRDEseGTt1qWIJAiqLxtRopEQj+bY8ZGqOzDWfKwrYrCCNVZg4bnqhBBkmcj OmLPA2OW4MmZyavPpzQmlAfrfKuIyHMHFBi3gQu6hhSRiiGfb0kST7o9jGAQrbrWIIVJ 8wC5RdPGwQHBUwJZVjuFcSp76IA3wSdNuPcZyJ38forYMxDmVbad3LhkhDY/gqr6F+LP Nq3Q== X-Gm-Message-State: AOJu0Yz5++dkDukKhcZfG9LsReDrpGM/R7walvp8LWIXzX0Xg+PpSF68 8ZJFR6x8v5Fb57LGL3WRBpqzTMbzss+FmCebLhP4Sg== X-Google-Smtp-Source: AGHT+IGeqfXWprj+nZME+RwVCadQkMvOcLS7LdTfmXoaFpcOTpeyMO+9ljqmTVYQ0RF0blcXjxrYxg== X-Received: by 2002:a17:90a:73c7:b0:262:ece1:5fd0 with SMTP id n7-20020a17090a73c700b00262ece15fd0mr1156328pjk.12.1692327190083; Thu, 17 Aug 2023 19:53:10 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:09 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH 11/14] net/softnic: replace abort with cancel Date: Thu, 17 Aug 2023 19:52:46 -0700 Message-Id: <20230818025249.33994-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The term abort is o the Tier 1 non-inclusive word list. Replace it with cancel. This also impacts the CLI for controlling this driver. Signed-off-by: Stephen Hemminger --- drivers/net/softnic/rte_eth_softnic_cli.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c b/drivers/net/softnic/rte_eth_softnic_cli.c index 085523fe0310..bdb89753696a 100644 --- a/drivers/net/softnic/rte_eth_softnic_cli.c +++ b/drivers/net/softnic/rte_eth_softnic_cli.c @@ -1389,14 +1389,14 @@ cmd_softnic_pipeline_commit(struct pmd_internals *softnic, status = rte_swx_ctl_pipeline_commit(p->ctl, 1); if (status) snprintf(out, out_size, "Commit failed. " - "Use \"commit\" to retry or \"abort\" to discard the pending work.\n"); + "Use \"commit\" to retry or \"cancel\" to discard the pending work.\n"); } /** - * pipeline abort + * pipeline cancel */ static void -cmd_softnic_pipeline_abort(struct pmd_internals *softnic, +cmd_softnic_pipeline_cancel(struct pmd_internals *softnic, char **tokens, uint32_t n_tokens, char *out, @@ -1417,7 +1417,7 @@ cmd_softnic_pipeline_abort(struct pmd_internals *softnic, return; } - rte_swx_ctl_pipeline_abort(p->ctl); + rte_swx_ctl_pipeline_cancel(p->ctl); } /** @@ -2428,8 +2428,8 @@ softnic_cli_process(char *in, char *out, size_t out_size, void *arg) return; } - if (n_tokens >= 3 && !strcmp(tokens[2], "abort")) { - cmd_softnic_pipeline_abort(softnic, tokens, n_tokens, out, out_size); + if (n_tokens >= 3 && !strcmp(tokens[2], "cancel")) { + cmd_softnic_pipeline_cancel(softnic, tokens, n_tokens, out, out_size); return; } -- 2.39.2