[PATCH] Missing use of macro rte_eth_dev_is_valid_port()

[PATCH] Missing use of macro rte_eth_dev_is_valid_port()

[Keith Wiles]

Signed-off-by: Keith Wiles <keith.wiles-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
 lib/librte_ether/rte_ethdev.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index bb94ccb..6fd89d7 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -3541,7 +3541,7 @@ rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,
 	return NULL;
 #endif
 	/* check input parameters */
-	if (port_id >= nb_ports || fn == NULL ||
+	if (!rte_eth_dev_is_valid_port(port_id) || fn == NULL ||
 		    queue_id >= rte_eth_devices[port_id].data->nb_rx_queues) {
 		rte_errno = EINVAL;
 		return NULL;
@@ -3570,7 +3570,7 @@ rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id,
 	return NULL;
 #endif
 	/* check input parameters */
-	if (port_id >= nb_ports || fn == NULL ||
+	if (!rte_eth_dev_is_valid_port(port_id) || fn == NULL ||
 		    queue_id >= rte_eth_devices[port_id].data->nb_tx_queues) {
 		rte_errno = EINVAL;
 		return NULL;
@@ -3598,7 +3598,7 @@ rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id,
 	return (-ENOTSUP);
 #endif
 	/* Check input parameters. */
-	if (port_id >= nb_ports || user_cb == NULL ||
+	if (!rte_eth_dev_is_valid_port(port_id) || user_cb == NULL ||
 		    queue_id >= rte_eth_devices[port_id].data->nb_rx_queues) {
 		return (-EINVAL);
 	}
@@ -3637,7 +3637,7 @@ rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id,
 	return (-ENOTSUP);
 #endif
 	/* Check input parameters. */
-	if (port_id >= nb_ports || user_cb == NULL ||
+	if (!rte_eth_dev_is_valid_port(port_id) || user_cb == NULL ||
 		    queue_id >= rte_eth_devices[port_id].data->nb_tx_queues) {
 		return (-EINVAL);
 	}
-- 
2.3.0

Re: [PATCH] Missing use of macro rte_eth_dev_is_valid_port()

[Mcnamara, John]

> -----Original Message-----
> From: dev [mailto:dev-bounces-VfR2kkLFssw@public.gmane.org] On Behalf Of Keith Wiles
> Sent: Thursday, February 26, 2015 2:01 PM
> To: dev-VfR2kkLFssw@public.gmane.org
> Subject: [dpdk-dev] [PATCH] Missing use of macro rte_eth_dev_is_valid_port()
> 
> Signed-off-by: Keith Wiles <keith.wiles-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

Acked-by: John McNamara <john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

-- 

Re: [PATCH] Missing use of macro rte_eth_dev_is_valid_port()

[Thomas Monjalon]

> > Signed-off-by: Keith Wiles <keith.wiles-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> 
> Acked-by: John McNamara <john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

Some checks with rte_eth_dev_is_valid_port() were missed when merging
hotplug and callbacks features.
    
Fixes: c282abd2a6cd ("ethdev: remove assumption that port will not be detached")

Applied, thanks