From 4bb4414040ffdc9f2676f22b540b8c77d2ba00fc Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 6 Mar 2015 18:23:23 -0800 Subject: [PATCH] ixgbe: prefix global function All global functions in a driver should use the same prefix to avoid any future name collisions. Signed-off-by: Stephen Hemminger Reviewed-by: Bruce Richardson [Bruce: one instance was missing] Acked-by: Changchun Ouyang --- lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 2 +- lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 4 ++-- lib/librte_pmd_ixgbe/ixgbe_rxtx.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c index 06da23148c..73bd8d45e4 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c +++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c @@ -749,7 +749,7 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev) * Tx queue may not initialized by primary process */ if (eth_dev->data->tx_queues) { txq = eth_dev->data->tx_queues[eth_dev->data->nb_tx_queues-1]; - set_tx_function(eth_dev, txq); + ixgbe_set_tx_function(eth_dev, txq); } else { /* Use default TX function if we get here */ PMD_INIT_LOG(INFO, "No TX queues configured yet. " diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c index 279da41d77..be8094d19a 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c @@ -1764,7 +1764,7 @@ static const struct ixgbe_txq_ops def_txq_ops = { * in dev_init by secondary process when attaching to an existing ethdev. */ void -set_tx_function(struct rte_eth_dev *dev, struct igb_tx_queue *txq) +ixgbe_set_tx_function(struct rte_eth_dev *dev, struct igb_tx_queue *txq) { /* Use a simple Tx queue (no offloads, no multi segs) if possible */ if (((txq->txq_flags & IXGBE_SIMPLE_FLAGS) == IXGBE_SIMPLE_FLAGS) @@ -1959,7 +1959,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, txq->sw_ring, txq->tx_ring, txq->tx_ring_phys_addr); /* set up vector or scalar TX function as appropriate */ - set_tx_function(dev, txq); + ixgbe_set_tx_function(dev, txq); txq->ops->reset(txq); diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.h b/lib/librte_pmd_ixgbe/ixgbe_rxtx.h index a85839e3c6..42d59f95e4 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.h +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.h @@ -253,7 +253,7 @@ struct ixgbe_txq_ops { * the queue parameters. Used in tx_queue_setup by primary process and then * in dev_init by secondary process when attaching to an existing ethdev. */ -void set_tx_function(struct rte_eth_dev *dev, struct igb_tx_queue *txq); +void ixgbe_set_tx_function(struct rte_eth_dev *dev, struct igb_tx_queue *txq); #ifdef RTE_IXGBE_INC_VECTOR uint16_t ixgbe_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, -- 2.20.1