net/bnx2x: fix invalid free on unplug

[dpdk.git] / drivers / net / bnx2x / bnx2x_rxtx.c

diff --git a/drivers/net/bnx2x/bnx2x_rxtx.c b/drivers/net/bnx2x/bnx2x_rxtx.c
index 589735e..e5a2b25 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_rxtx.c
+++ b/drivers/net/bnx2x/bnx2x_rxtx.c
@@ -12,19 +12,8 @@ static const struct rte_memzone *
 ring_dma_zone_reserve(struct rte_eth_dev *dev, const char *ring_name,
                      uint16_t queue_id, uint32_t ring_size, int socket_id)
 {
-       char z_name[RTE_MEMZONE_NAMESIZE];
-       const struct rte_memzone *mz;
-
-       snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
-                       dev->device->driver->name, ring_name,
-                       dev->data->port_id, queue_id);
-
-       mz = rte_memzone_lookup(z_name);
-       if (mz)
-               return mz;
-
-       return rte_memzone_reserve_aligned(z_name, ring_size, socket_id,
-                       RTE_MEMZONE_IOVA_CONTIG, BNX2X_PAGE_SIZE);
+       return rte_eth_dma_zone_reserve(dev, ring_name, queue_id,
+                       ring_size, BNX2X_PAGE_SIZE, socket_id);
 }
 
 static void
@@ -322,7 +311,6 @@ bnx2x_dev_tx_queue_setup(struct rte_eth_dev *dev,
        txq->tx_bd_tail = 0;
        txq->tx_bd_head = 0;
        txq->nb_tx_avail = txq->nb_tx_desc;
-       dev->tx_pkt_burst = bnx2x_xmit_pkts;
        dev->data->tx_queues[queue_idx] = txq;
        if (!sc->tx_queues) sc->tx_queues = dev->data->tx_queues;
 
@@ -452,14 +440,26 @@ next_rx:
        return nb_rx;
 }
 
-int
-bnx2x_dev_rx_init(struct rte_eth_dev *dev)
+static uint16_t
+bnx2x_rxtx_pkts_dummy(__rte_unused void *p_rxq,
+                     __rte_unused struct rte_mbuf **rx_pkts,
+                     __rte_unused uint16_t nb_pkts)
 {
-       dev->rx_pkt_burst = bnx2x_recv_pkts;
-
        return 0;
 }
 
+void bnx2x_dev_rxtx_init_dummy(struct rte_eth_dev *dev)
+{
+       dev->rx_pkt_burst = bnx2x_rxtx_pkts_dummy;
+       dev->tx_pkt_burst = bnx2x_rxtx_pkts_dummy;
+}
+
+void bnx2x_dev_rxtx_init(struct rte_eth_dev *dev)
+{
+       dev->rx_pkt_burst = bnx2x_recv_pkts;
+       dev->tx_pkt_burst = bnx2x_xmit_pkts;
+}
+
 void
 bnx2x_dev_clear_queues(struct rte_eth_dev *dev)
 {