[dpdk-dev] [PATCH v2] ethdev: fix naming for device capability

[dpdk-dev] [PATCH v2] ethdev: fix naming for device capability

[Qi Zhang]

Rename all device capabilities to start with RTE_ETH_DEV_CAPA.

Fixes: 8719ad91e5772 ("ethdev: support runtime queue setup")

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---

v2:
- fix fix line

 doc/guides/nics/features.rst   | 4 ++--
 drivers/net/i40e/i40e_ethdev.c | 4 ++--
 lib/librte_ether/rte_ethdev.c  | 4 ++--
 lib/librte_ether/rte_ethdev.h  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
index 67d459f80..14b8672bc 100644
--- a/doc/guides/nics/features.rst
+++ b/doc/guides/nics/features.rst
@@ -899,7 +899,7 @@ Runtime Rx queue setup
 
 Supports Rx queue setup after device started.
 
-* **[provides] rte_eth_dev_info**: ``dev_capa:DEV_CAPA_RUNTIME_RX_QUEUE_SETUP``.
+* **[provides] rte_eth_dev_info**: ``dev_capa:RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP``.
 * **[related]  API**: ``rte_eth_dev_info_get()``.
 
 .. _nic_features_runtime_tx_queue_setup:
@@ -909,7 +909,7 @@ Runtime Tx queue setup
 
 Supports Tx queue setup after device started.
 
-* **[provides] rte_eth_dev_info**: ``dev_capa:DEV_CAPA_RUNTIME_TX_QUEUE_SETUP``.
+* **[provides] rte_eth_dev_info**: ``dev_capa:RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP``.
 * **[related]  API**: ``rte_eth_dev_info_get()``.
 
 .. _nic_features_other:
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index e329042df..2fc98a7e7 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -3245,8 +3245,8 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 		DEV_TX_OFFLOAD_IPIP_TNL_TSO |
 		DEV_TX_OFFLOAD_GENEVE_TNL_TSO;
 	dev_info->dev_capa =
-		DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |
-		DEV_CAPA_RUNTIME_TX_QUEUE_SETUP;
+		RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |
+		RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP;
 
 	dev_info->hash_key_size = (I40E_PFQF_HKEY_MAX_INDEX + 1) *
 						sizeof(uint32_t);
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 0e503ab7e..5f1a1bf2b 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1478,7 +1478,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
 
 	if (dev->data->dev_started &&
 		!(dev_info.dev_capa &
-			DEV_CAPA_RUNTIME_RX_QUEUE_SETUP))
+			RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP))
 		return -EBUSY;
 
 	if (dev->data->rx_queue_state[rx_queue_id] !=
@@ -1586,7 +1586,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
 
 	if (dev->data->dev_started &&
 		!(dev_info.dev_capa &
-			DEV_CAPA_RUNTIME_TX_QUEUE_SETUP))
+			RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP))
 		return -EBUSY;
 
 	if (dev->data->tx_queue_state[tx_queue_id] !=
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 4096f688a..8da452cdf 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -993,9 +993,9 @@ struct rte_eth_conf {
  */
 #define DEV_TX_OFFLOAD_IP_TNL_TSO       0x00080000
 
-#define DEV_CAPA_RUNTIME_RX_QUEUE_SETUP 0x00000001
+#define RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP 0x00000001
 /**< Device supports Rx queue setup after device started*/
-#define DEV_CAPA_RUNTIME_TX_QUEUE_SETUP 0x00000002
+#define RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP 0x00000002
 /**< Device supports Tx queue setup after device started*/
 
 /*
@@ -1071,7 +1071,7 @@ struct rte_eth_dev_info {
 	struct rte_eth_dev_portconf default_rxportconf;
 	/** Tx parameter recommendations */
 	struct rte_eth_dev_portconf default_txportconf;
-	/** Generic device capabilities */
+	/** Generic device capabilities (RTE_ETH_DEV_CAPA_). */
 	uint64_t dev_capa;
 };
 
-- 
2.13.6

Re: [dpdk-dev] [PATCH v2] ethdev: fix naming for device capability

[Ferruh Yigit]

On 4/25/2018 9:39 AM, Qi Zhang wrote:
> Rename all device capabilities to start with RTE_ETH_DEV_CAPA.
> 
> Fixes: 8719ad91e5772 ("ethdev: support runtime queue setup")
> 
> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>

Squashed into relevant commit in next-net, thanks.