On Fri, Mar 06, 2015 at 06:23:23PM -0800, Stephen Hemminger wrote:
> All global functions in a driver should use the same prefix
> to avoid any future name collisions.
>
> Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
I think this patch is missing one instance of set_tx_function at line 1963 of
ixgbe_rxtx.c that needs to be renamed.
/Bruce
> ---
> lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 2 +-
> lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 2 +-
> lib/librte_pmd_ixgbe/ixgbe_rxtx.h | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
> b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
> index 9bdc046..e1504f4 100644
> --- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
> +++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
> @@ -753,7 +753,7 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct
> eth_driver *eth_drv,
> * 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 0f32296..c5ba687 100644
> --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
> +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
> @@ -1765,7 +1765,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)
> diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.h
> b/lib/librte_pmd_ixgbe/ixgbe_rxtx.h
> index a85839e..42d59f9 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.1.4
>
