Replace abort with cancel.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/common/sfc_efx/efsys.h | 2 +-
drivers/common/sfc_efx/sfc_efx_mcdi.c | 6 +++---
drivers/common/sfc_efx/version.map | 2 +-
drivers/net/sfc/sfc_ef10_rx.c | 2 +-
drivers/net/sfc/sfc_ev.c | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
@@ -548,7 +548,7 @@ typedef struct efsys_bar_s {
* (required by PIO hardware).
*
* Neither VFIO, nor UIO, nor NIC UIO (on FreeBSD) support
- * write-combined memory mapped to user-land, so just abort if used.
+ * write-combined memory mapped to user-land, so just cancel if used.
*/
#define EFSYS_BAR_WC_WRITEQ(_esbp, _offset, _eqp) \
do { \
@@ -76,7 +76,7 @@ sfc_efx_mcdi_poll(struct sfc_efx_mcdi *mcdi, boolean_t proxy)
efx_nic_t *enp;
unsigned int delay_total;
unsigned int delay_us;
- boolean_t aborted __rte_unused;
+ boolean_t canceled __rte_unused;
delay_total = 0;
delay_us = SFC_EFX_MCDI_POLL_INTERVAL_MIN_US;
@@ -93,8 +93,8 @@ sfc_efx_mcdi_poll(struct sfc_efx_mcdi *mcdi, boolean_t proxy)
if (delay_total > SFC_EFX_MCDI_WATCHDOG_INTERVAL_US) {
if (!proxy) {
- aborted = efx_mcdi_request_abort(enp);
- SFC_EFX_ASSERT(aborted);
+ canceled = efx_mcdi_request_cancel(enp);
+ SFC_EFX_ASSERT(canceled);
sfc_efx_mcdi_timeout(mcdi);
}
@@ -165,7 +165,7 @@ INTERNAL {
efx_mcdi_mport_alloc_alias;
efx_mcdi_new_epoch;
efx_mcdi_reboot;
- efx_mcdi_request_abort;
+ efx_mcdi_request_cancel;
efx_mcdi_request_poll;
efx_mcdi_request_start;
@@ -265,7 +265,7 @@ sfc_ef10_rx_process_event(struct sfc_ef10_rxq *rxq, efx_qword_t rx_ev,
EFX_MASK32(ESF_DZ_RX_DSC_PTR_LBITS);
if (ready == 0) {
- /* Rx abort - it was no enough descriptors for Rx packet */
+ /* Rx cancel - it was no enough descriptors for Rx packet */
rte_pktmbuf_free(rxq->scatter_pkt);
rxq->scatter_pkt = NULL;
return rx_pkts;
@@ -104,13 +104,13 @@ sfc_ev_efx_rx(void *arg, __rte_unused uint32_t label, uint32_t id,
if (delta == 0) {
/*
* Rx event with no new descriptors done and zero length
- * is used to abort scattered packet when there is no room
+ * is used to cancel scattered packet when there is no room
* for the tail.
*/
if (unlikely(size != 0)) {
evq->exception = B_TRUE;
sfc_err(evq->sa,
- "EVQ %u RxQ %u invalid RX abort "
+ "EVQ %u RxQ %u invalid RX cancel "
"(id=%#x size=%u flags=%#x); needs restart",
evq->evq_index, rxq->dp.dpq.queue_id,
id, size, flags);