From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Subject: [PATCH v2 11/13] net/softnic: replace abort with cancel
Date: Fri, 18 Aug 2023 10:45:35 -0700 [thread overview]
Message-ID: <20230818174537.290222-12-stephen@networkplumber.org> (raw)
In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.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 <stephen@networkplumber.org>
---
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 <pipeline_name> abort
+ * pipeline <pipeline_name> 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
next prev parent reply other threads:[~2023-08-18 17:48 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
2023-08-18 2:52 ` [PATCH 01/14] jobstats: change jobstats_abort to jobstats_cancel Stephen Hemminger
2023-08-18 9:08 ` Bruce Richardson
2023-08-18 16:10 ` Stephen Hemminger
2023-08-18 2:52 ` [PATCH 02/14] all: remove use of word abort Stephen Hemminger
2023-08-18 4:04 ` Honnappa Nagarahalli
2023-08-18 2:52 ` [PATCH 03/14] pipeline: remove use of term abort Stephen Hemminger
2023-08-18 2:52 ` [PATCH 04/14] net/vmxnet3: replace abort() with rte_panic() Stephen Hemminger
2023-08-18 2:52 ` [PATCH 05/14] event/dlb2: remove word abort in comments Stephen Hemminger
2023-08-18 2:52 ` [PATCH 06/14] net/vdev_netvsc: replace use of term abort Stephen Hemminger
2023-08-18 2:52 ` [PATCH 07/14] net/netvsc: replace abort with cancel Stephen Hemminger
2023-08-18 2:52 ` [PATCH 08/14] net/ionic: remove word aborting Stephen Hemminger
2023-08-18 2:52 ` [PATCH 09/14] net/bnx2x: replace abort with cancel Stephen Hemminger
2023-08-18 2:52 ` [PATCH 10/14] net/mlx5: " Stephen Hemminger
2023-08-18 2:52 ` [PATCH 11/14] net/softnic: " Stephen Hemminger
2023-08-18 2:52 ` [PATCH 12/14] net/mlx4: remove word abort Stephen Hemminger
2023-08-18 2:52 ` [PATCH 13/14] sfc: remove use of term abort Stephen Hemminger
2023-08-18 2:52 ` [PATCH 14/14] net/axgbe: replace word abort Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 01/13] jobstats: change jobstats_abort to jobstats_cancel Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 02/13] all: remove use of word abort Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 03/13] pipeline: remove use of term abort Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 04/13] net/vmxnet3: replace abort() with rte_panic() Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 05/13] event/dlb2: remove word abort in comments Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 06/13] net/vdev_netvsc: replace use of term abort Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 07/13] net/netvsc: replace abort with cancel Stephen Hemminger
2023-08-18 22:26 ` Long Li
2023-08-18 17:45 ` [PATCH v2 08/13] net/ionic: remove word aborting Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 09/13] net/bnx2x: replace abort with cancel Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 10/13] net/mlx5: " Stephen Hemminger
2023-08-18 17:45 ` Stephen Hemminger [this message]
2023-08-18 17:45 ` [PATCH v2 12/13] net/mlx4: remove word abort Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 13/13] net/axgbe: replace " Stephen Hemminger
2023-08-30 16:49 ` [PATCH v2 00/13] Replace us of term abort Thomas Monjalon
2023-09-06 19:39 ` Stephen Hemminger
2023-09-06 21:19 ` Thomas Monjalon
2023-09-06 23:03 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230818174537.290222-12-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=cristian.dumitrescu@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).