[dpdk-dev] [PATCH 10/13] net/sfc: clarify Tx subsystem configure/close function names
Andrew Rybchenko
arybchenko at solarflare.com
Fri Mar 31 12:22:20 CEST 2017
Prepare to fix device reconfigure. Make it clear that corresponding
functions should be called on device configure and close operations.
No functional change.
Fixes: a8ad8cf83f01 ("net/sfc: provide basic stubs for Tx subsystem")
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
Reviewed-by: Andy Moreton <amoreton at solarflare.com>
---
drivers/net/sfc/sfc.c | 8 ++++----
drivers/net/sfc/sfc_tx.c | 4 ++--
drivers/net/sfc/sfc_tx.h | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index 88228ae..22141c6 100644
--- a/drivers/net/sfc/sfc.c
+++ b/drivers/net/sfc/sfc.c
@@ -417,15 +417,15 @@ sfc_configure(struct sfc_adapter *sa)
if (rc != 0)
goto fail_rx_configure;
- rc = sfc_tx_init(sa);
+ rc = sfc_tx_configure(sa);
if (rc != 0)
- goto fail_tx_init;
+ goto fail_tx_configure;
sa->state = SFC_ADAPTER_CONFIGURED;
sfc_log_init(sa, "done");
return 0;
-fail_tx_init:
+fail_tx_configure:
sfc_rx_close(sa);
fail_rx_configure:
@@ -451,7 +451,7 @@ sfc_close(struct sfc_adapter *sa)
SFC_ASSERT(sa->state == SFC_ADAPTER_CONFIGURED);
sa->state = SFC_ADAPTER_CLOSING;
- sfc_tx_fini(sa);
+ sfc_tx_close(sa);
sfc_rx_close(sa);
sfc_port_close(sa);
sfc_intr_close(sa);
diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index 9597029..1605eaa 100644
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -290,7 +290,7 @@ sfc_tx_check_mode(struct sfc_adapter *sa, const struct rte_eth_txmode *txmode)
}
int
-sfc_tx_init(struct sfc_adapter *sa)
+sfc_tx_configure(struct sfc_adapter *sa)
{
const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
const struct rte_eth_conf *dev_conf = &sa->eth_dev->data->dev_conf;
@@ -341,7 +341,7 @@ sfc_tx_init(struct sfc_adapter *sa)
}
void
-sfc_tx_fini(struct sfc_adapter *sa)
+sfc_tx_close(struct sfc_adapter *sa)
{
int sw_index;
diff --git a/drivers/net/sfc/sfc_tx.h b/drivers/net/sfc/sfc_tx.h
index 94477f7..6c3ac3b 100644
--- a/drivers/net/sfc/sfc_tx.h
+++ b/drivers/net/sfc/sfc_tx.h
@@ -134,8 +134,8 @@ struct sfc_txq_info {
boolean_t deferred_started;
};
-int sfc_tx_init(struct sfc_adapter *sa);
-void sfc_tx_fini(struct sfc_adapter *sa);
+int sfc_tx_configure(struct sfc_adapter *sa);
+void sfc_tx_close(struct sfc_adapter *sa);
int sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
uint16_t nb_tx_desc, unsigned int socket_id,
--
2.9.3
More information about the dev
mailing list