From f7637d4d555321803ce71f70475ede5230369782 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Fri, 31 Mar 2017 11:22:19 +0100 Subject: [PATCH] net/sfc: clarify Rx subsystem configure/close function names Prepare to fix device reconfigure. Make it clear that corresponding functions should be called on device configure and close operations. No functional change. Fixes: a8e64c6b455f ("net/sfc: implement Rx subsystem stubs") Cc: stable@dpdk.org Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/net/sfc/sfc.c | 10 +++++----- drivers/net/sfc/sfc_rx.c | 4 ++-- drivers/net/sfc/sfc_rx.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index 8da7879916..88228ae824 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -413,9 +413,9 @@ sfc_configure(struct sfc_adapter *sa) if (rc != 0) goto fail_port_configure; - rc = sfc_rx_init(sa); + rc = sfc_rx_configure(sa); if (rc != 0) - goto fail_rx_init; + goto fail_rx_configure; rc = sfc_tx_init(sa); if (rc != 0) @@ -426,9 +426,9 @@ sfc_configure(struct sfc_adapter *sa) return 0; fail_tx_init: - sfc_rx_fini(sa); + sfc_rx_close(sa); -fail_rx_init: +fail_rx_configure: sfc_port_close(sa); fail_port_configure: @@ -452,7 +452,7 @@ sfc_close(struct sfc_adapter *sa) sa->state = SFC_ADAPTER_CLOSING; sfc_tx_fini(sa); - sfc_rx_fini(sa); + sfc_rx_close(sa); sfc_port_close(sa); sfc_intr_close(sa); diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index d8cd2286c7..2ddb1451c1 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -1215,7 +1215,7 @@ sfc_rx_check_mode(struct sfc_adapter *sa, struct rte_eth_rxmode *rxmode) * It should be used to allocate NUMA-unaware resources. */ int -sfc_rx_init(struct sfc_adapter *sa) +sfc_rx_configure(struct sfc_adapter *sa) { struct rte_eth_conf *dev_conf = &sa->eth_dev->data->dev_conf; unsigned int sw_index; @@ -1270,7 +1270,7 @@ fail_check_mode: * reconfiguration or shutdown. */ void -sfc_rx_fini(struct sfc_adapter *sa) +sfc_rx_close(struct sfc_adapter *sa) { unsigned int sw_index; diff --git a/drivers/net/sfc/sfc_rx.h b/drivers/net/sfc/sfc_rx.h index 521e50ef98..9e6282eadd 100644 --- a/drivers/net/sfc/sfc_rx.h +++ b/drivers/net/sfc/sfc_rx.h @@ -149,8 +149,8 @@ struct sfc_rxq_info { boolean_t deferred_started; }; -int sfc_rx_init(struct sfc_adapter *sa); -void sfc_rx_fini(struct sfc_adapter *sa); +int sfc_rx_configure(struct sfc_adapter *sa); +void sfc_rx_close(struct sfc_adapter *sa); int sfc_rx_start(struct sfc_adapter *sa); void sfc_rx_stop(struct sfc_adapter *sa); -- 2.20.1