[PATCH v3] net/igc: move the initialization of data path into dev_init

[zhichaox . zeng]

From: Zhichao Zeng <zhichaox.z...@intel.com>

The upper-layer application usually call the common interface "dev_init"
to initialize the data path, but in the igc driver, the initialization
of data path is in "igc_rx_init" and "eth_igc_tx_queue_setup", while in
other drivers it is in "dev_init". So when upper-layer application
calling these function pointers will occur segmentation faults.

This patch moves the initialization of data path into "eth_igc_dev_init"
to avoid segmentation faults, which is consistent with other drivers.

Fixes: a5aeb2b9e225 ("net/igc: support Rx and Tx")
Cc: alvinx.zh...@intel.com
Cc: sta...@dpdk.org

Signed-off-by: Zhichao Zeng <zhichaox.z...@intel.com>

---
v2:
remove unnecessary parameters, move declaration to relevant header file
---
v3:
remove redundant code, optimize commit log
---
 drivers/net/igc/igc_ethdev.c |  3 +++
 drivers/net/igc/igc_txrx.c   | 10 +++-------
 drivers/net/igc/igc_txrx.h   |  4 ++++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c
index b9933b395d..25fb91bfec 100644
--- a/drivers/net/igc/igc_ethdev.c
+++ b/drivers/net/igc/igc_ethdev.c
@@ -1234,6 +1234,9 @@ eth_igc_dev_init(struct rte_eth_dev *dev)
        dev->rx_queue_count = eth_igc_rx_queue_count;
        dev->rx_descriptor_status = eth_igc_rx_descriptor_status;
        dev->tx_descriptor_status = eth_igc_tx_descriptor_status;
+       dev->rx_pkt_burst = igc_recv_pkts;
+       dev->tx_pkt_burst = igc_xmit_pkts;
+       dev->tx_pkt_prepare = eth_igc_prep_pkts;
 
        /*
         * for secondary processes, we don't initialize any further as primary
diff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c
index e48d5df11a..f38c5e7863 100644
--- a/drivers/net/igc/igc_txrx.c
+++ b/drivers/net/igc/igc_txrx.c
@@ -345,7 +345,7 @@ rx_desc_get_pkt_info(struct igc_rx_queue *rxq, struct 
rte_mbuf *rxm,
        rxm->packet_type = rx_desc_pkt_info_to_pkt_type(pkt_info);
 }
 
-static uint16_t
+uint16_t
 igc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 {
        struct igc_rx_queue * const rxq = rx_queue;
@@ -1071,8 +1071,6 @@ igc_rx_init(struct rte_eth_dev *dev)
        uint16_t i;
        int ret;
 
-       dev->rx_pkt_burst = igc_recv_pkts;
-
        /*
         * Make sure receives are disabled while setting
         * up the descriptor ring.
@@ -1397,7 +1395,7 @@ eth_igc_rx_queue_setup(struct rte_eth_dev *dev,
 }
 
 /* prepare packets for transmit */
-static uint16_t
+uint16_t
 eth_igc_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
                uint16_t nb_pkts)
 {
@@ -1604,7 +1602,7 @@ tx_desc_cksum_flags_to_olinfo(uint64_t ol_flags)
        return tmp;
 }
 
-static uint16_t
+uint16_t
 igc_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
        struct igc_tx_queue * const txq = tx_queue;
@@ -2030,8 +2028,6 @@ int eth_igc_tx_queue_setup(struct rte_eth_dev *dev, 
uint16_t queue_idx,
                txq->sw_ring, txq->tx_ring, txq->tx_ring_phys_addr);
 
        igc_reset_tx_queue(txq);
-       dev->tx_pkt_burst = igc_xmit_pkts;
-       dev->tx_pkt_prepare = &eth_igc_prep_pkts;
        dev->data->tx_queues[queue_idx] = txq;
        txq->offloads = tx_conf->offloads;
 
diff --git a/drivers/net/igc/igc_txrx.h b/drivers/net/igc/igc_txrx.h
index 535108a868..a5240df9d7 100644
--- a/drivers/net/igc/igc_txrx.h
+++ b/drivers/net/igc/igc_txrx.h
@@ -49,6 +49,10 @@ void eth_igc_txq_info_get(struct rte_eth_dev *dev, uint16_t 
queue_id,
        struct rte_eth_txq_info *qinfo);
 void eth_igc_vlan_strip_queue_set(struct rte_eth_dev *dev,
                        uint16_t rx_queue_id, int on);
+uint16_t igc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t 
nb_pkts);
+uint16_t igc_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t 
nb_pkts);
+uint16_t eth_igc_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf 
**tx_pkts,
+       uint16_t nb_pkts);
 #ifdef __cplusplus
 }
 #endif
-- 
2.25.1