diff mbox

[dpdk-dev,09/13] net/sfc: clarify Rx subsystem configure/close function names

Message ID 1490955743-9868-10-git-send-email-arybchenko@solarflare.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail apply patch file failure

Commit Message

Andrew Rybchenko March 31, 2017, 10:22 a.m. UTC 
  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")

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Andy Moreton <amoreton@solarflare.com>
---
 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 mbox

Patch

diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index 8da7879..88228ae 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 9ca5eeb..92c5424 100644
--- a/drivers/net/sfc/sfc_rx.c
+++ b/drivers/net/sfc/sfc_rx.c
@@ -1216,7 +1216,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;
@@ -1271,7 +1271,7 @@  sfc_rx_init(struct sfc_adapter *sa)
  * 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 521e50e..9e6282e 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);