The rx_free_thresh parameter was conflicting with a global value in testpmd when certain driver-specific files were included in the testpmd build. Rename the parameter to just "free_thresh" - the "rx" is unnecessary since the function itself is for Rx queues.
Signed-off-by: Bruce Richardson <[email protected]> --- drivers/net/intel/common/rx.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/intel/common/rx.h b/drivers/net/intel/common/rx.h index 5012e4fced..80b62ce3d5 100644 --- a/drivers/net/intel/common/rx.h +++ b/drivers/net/intel/common/rx.h @@ -228,11 +228,11 @@ ci_rxq_mbuf_initializer(uint16_t port_id) * Individual drivers may have other further tests beyond this. */ static inline bool -ci_rxq_vec_capable(uint16_t nb_desc, uint16_t rx_free_thresh) +ci_rxq_vec_capable(uint16_t nb_desc, uint16_t free_thresh) { if (!rte_is_power_of_2(nb_desc) || - rx_free_thresh < CI_RX_MAX_BURST || - (nb_desc % rx_free_thresh) != 0) + free_thresh < CI_RX_MAX_BURST || + (nb_desc % free_thresh) != 0) return false; return true; -- 2.48.1

