From patchwork Fri Aug 18 17:45:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130536 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D2D224309A; Fri, 18 Aug 2023 19:48:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B745B4328B; Fri, 18 Aug 2023 19:47:00 +0200 (CEST) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mails.dpdk.org (Postfix) with ESMTP id 0F7EB4326F for ; Fri, 18 Aug 2023 19:46:55 +0200 (CEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6887918ed20so1072642b3a.2 for ; Fri, 18 Aug 2023 10:46:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380814; x=1692985614; 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=VqNsU3pKTI8Hcgaeh6++BGPnkiwSJFaB6LbNbZf0sCjP3Ni+mwn5I8Dti1jpVDLdPw sT3ftg5UoV72tO24sfzNT7to7Jsj5x7MzcDZYcxrhBk9wkmPZrMKkCGAIEIUU2r9F6gx nEPOaV8shuh1wBE7cNMobGrTGKnMEnPzypxbBA8Uo8L7M5fDbnPbgnPgxSrdcliOjx3N ACX6JcPTb4AnvvFhz8xjUP4OvKjLgXq26hSimbxDTYE7/hC34vvUL2ZAwFiM4HJ8UVzu qzbghAE83JJLklPUEZoQjTJLnW4ncBmWSeSKghMirzGajzGnex/oaVgFxhZ+i42FpaGV VJxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380814; x=1692985614; 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=A6mC8ex3pFb20xEpiXtvSl6cIZx/m0tav782TCx3C9DY4HwbOaiRQukokYH2yWqMS9 HPhuq6TX++i6DfKczED6kaH1ydSIJDDoJRohMja2EM4TOqskp9MS65aws3pL2LHOnt4l Jy1X8dQYYj/sqVJdN7mFB3AOrRq1cwuK4POsC1JMcQa/32pB343E+vvRXRFpPU9SErKW lg6mxx+zYMs+qebC5lul/7bfOKWxN+dJlUmoF5aIzSVjr2M58+YdQ/P7kxB/kYdPbfgO KiYBadqy1IVpsyt/Vh6EN+ArmePDYARKcYuok3pwP4GwV87i2vYePqaKZgrb58rnOAwz YiQg== X-Gm-Message-State: AOJu0YyQ4/UBR4uNuv2MwzJuUeqvFiAOuHHKj7D5asDtcvJRk3LnrQMa oXO9iERq+6V6r5k0QZsHFIGsjoMjIRjp0D+Bq4eZIQ== X-Google-Smtp-Source: AGHT+IF+bvo1UQPOqc0xU4CTbAfKKObTaMp8EsqFhYWYwwC/GugZyTYP4ubHGYe3gnx/n5xm6F9VMg== X-Received: by 2002:a05:6a20:12d1:b0:11d:8a8f:655d with SMTP id v17-20020a056a2012d100b0011d8a8f655dmr4759077pzg.4.1692380814019; Fri, 18 Aug 2023 10:46:54 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:53 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH v2 11/13] net/softnic: replace abort with cancel Date: Fri, 18 Aug 2023 10:45:35 -0700 Message-Id: <20230818174537.290222-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-1-stephen@networkplumber.org> MIME-Version: 1.0 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; }