From 3eb7e207ea8615cf12a0964e073ad86b1b4397b2 Mon Sep 17 00:00:00 2001 From: Zhiyong Yang Date: Thu, 12 Oct 2017 17:32:47 +0800 Subject: [PATCH] ethdev: fix port id type Some features applied were still developed based on older version uint8_t port_id, but port_id has been increased range to uint16_t. The patch fixes the issue. Fixes: f8244c6399d9 ("ethdev: increase port id range") Signed-off-by: Zhiyong Yang --- lib/librte_ether/ethdev_profile.c | 6 +++--- lib/librte_ether/ethdev_profile.h | 2 +- lib/librte_ether/rte_ethdev.c | 2 +- lib/librte_ether/rte_ethdev.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/librte_ether/ethdev_profile.c b/lib/librte_ether/ethdev_profile.c index 13c48a8f3f..8792ed56ee 100644 --- a/lib/librte_ether/ethdev_profile.c +++ b/lib/librte_ether/ethdev_profile.c @@ -82,7 +82,7 @@ struct itt_profile_rx_data itt_rx_data[RTE_MAX_ETHPORTS]; * type declaration. */ static uint16_t -collect_itt_rx_burst_cb(uint8_t port_id, uint16_t queue_id, +collect_itt_rx_burst_cb(uint16_t port_id, uint16_t queue_id, __rte_unused struct rte_mbuf *pkts[], uint16_t nb_pkts, __rte_unused uint16_t max_pkts, __rte_unused void *user_param) { @@ -121,7 +121,7 @@ collect_itt_rx_burst_cb(uint8_t port_id, uint16_t queue_id, * - On failure, a negative value. */ static inline int -itt_profile_rx_init(uint8_t port_id, char *port_name, uint8_t rx_queue_num) +itt_profile_rx_init(uint16_t port_id, char *port_name, uint8_t rx_queue_num) { uint16_t q_id; @@ -155,7 +155,7 @@ itt_profile_rx_init(uint8_t port_id, char *port_name, uint8_t rx_queue_num) #endif /* RTE_ETHDEV_PROFILE_ITT_WASTED_RX_ITERATIONS */ int -__rte_eth_profile_rx_init(__rte_unused uint8_t port_id, +__rte_eth_profile_rx_init(__rte_unused uint16_t port_id, __rte_unused struct rte_eth_dev *dev) { #ifdef RTE_ETHDEV_PROFILE_ITT_WASTED_RX_ITERATIONS diff --git a/lib/librte_ether/ethdev_profile.h b/lib/librte_ether/ethdev_profile.h index 32f103ec17..697facff73 100644 --- a/lib/librte_ether/ethdev_profile.h +++ b/lib/librte_ether/ethdev_profile.h @@ -51,6 +51,6 @@ * - On failure, a negative value. */ int -__rte_eth_profile_rx_init(uint8_t port_id, struct rte_eth_dev *dev); +__rte_eth_profile_rx_init(uint16_t port_id, struct rte_eth_dev *dev); #endif diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 9460161eb5..8f027c71b3 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -3628,7 +3628,7 @@ rte_eth_dev_adjust_nb_rx_tx_desc(uint16_t port_id, } int -rte_eth_dev_pool_ops_supported(uint8_t port_id, const char *pool) +rte_eth_dev_pool_ops_supported(uint16_t port_id, const char *pool) { struct rte_eth_dev *dev; diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 354d170eff..3f19117b2c 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -4583,7 +4583,7 @@ int rte_eth_dev_adjust_nb_rx_tx_desc(uint16_t port_id, * - -EINVAL: Pool param is null. */ int -rte_eth_dev_pool_ops_supported(uint8_t port_id, const char *pool); +rte_eth_dev_pool_ops_supported(uint16_t port_id, const char *pool); #ifdef __cplusplus } -- 2.20.1