In a couple of places, we are using explicit mac type comparisons to trigger a VF-specific path, but we already have a function that does the same thing, so use it.
Signed-off-by: Anatoly Burakov <anatoly.bura...@intel.com> --- drivers/net/intel/ixgbe/ixgbe_rxtx.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/net/intel/ixgbe/ixgbe_rxtx.c b/drivers/net/intel/ixgbe/ixgbe_rxtx.c index 0c8a9ec763..b216e0612a 100644 --- a/drivers/net/intel/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/intel/ixgbe/ixgbe_rxtx.c @@ -87,6 +87,9 @@ #define rte_ixgbe_prefetch(p) do {} while (0) #endif +/* forward-declare some functions */ +static int ixgbe_is_vf(struct rte_eth_dev *dev); + /********************************************************************* * * TX functions @@ -2766,12 +2769,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, /* * Modification to set VFTDT for virtual function if vf is detected */ - if (hw->mac.type == ixgbe_mac_82599_vf || - hw->mac.type == ixgbe_mac_E610_vf || - hw->mac.type == ixgbe_mac_X540_vf || - hw->mac.type == ixgbe_mac_X550_vf || - hw->mac.type == ixgbe_mac_X550EM_x_vf || - hw->mac.type == ixgbe_mac_X550EM_a_vf) + if (ixgbe_is_vf(dev)) txq->qtx_tail = IXGBE_PCI_REG_ADDR(hw, IXGBE_VFTDT(queue_idx)); else txq->qtx_tail = IXGBE_PCI_REG_ADDR(hw, IXGBE_TDT(txq->reg_idx)); @@ -3154,12 +3152,7 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, /* * Modified to setup VFRDT for Virtual Function */ - if (hw->mac.type == ixgbe_mac_82599_vf || - hw->mac.type == ixgbe_mac_E610_vf || - hw->mac.type == ixgbe_mac_X540_vf || - hw->mac.type == ixgbe_mac_X550_vf || - hw->mac.type == ixgbe_mac_X550EM_x_vf || - hw->mac.type == ixgbe_mac_X550EM_a_vf) { + if (ixgbe_is_vf(dev)) { rxq->rdt_reg_addr = IXGBE_PCI_REG_ADDR(hw, IXGBE_VFRDT(queue_idx)); rxq->rdh_reg_addr = -- 2.47.1