net/mlx5: add header reformat HW steering action

[dpdk.git] / drivers / net / hns3 / hns3_rxtx.c

diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index c43131c..a28de06 100644 (file)
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -86,8 +86,7 @@ hns3_rx_queue_release(void *queue)
                hns3_rx_queue_release_mbufs(rxq);
                if (rxq->mz)
                        rte_memzone_free(rxq->mz);
-               if (rxq->sw_ring)
-                       rte_free(rxq->sw_ring);
+               rte_free(rxq->sw_ring);
                rte_free(rxq);
        }
 }
@@ -100,10 +99,8 @@ hns3_tx_queue_release(void *queue)
                hns3_tx_queue_release_mbufs(txq);
                if (txq->mz)
                        rte_memzone_free(txq->mz);
-               if (txq->sw_ring)
-                       rte_free(txq->sw_ring);
-               if (txq->free)
-                       rte_free(txq->free);
+               rte_free(txq->sw_ring);
+               rte_free(txq->free);
                rte_free(txq);
        }
 }
@@ -1382,9 +1379,6 @@ hns3_alloc_rxq_and_dma_zone(struct rte_eth_dev *dev,
        rxq->rx_ring = (struct hns3_desc *)rx_mz->addr;
        rxq->rx_ring_phys_addr = rx_mz->iova;
 
-       hns3_dbg(hw, "No.%u rx descriptors iova 0x%" PRIx64, q_info->idx,
-                rxq->rx_ring_phys_addr);
-
        return rxq;
 }
 
@@ -1469,9 +1463,6 @@ hns3_alloc_txq_and_dma_zone(struct rte_eth_dev *dev,
        txq->tx_ring = (struct hns3_desc *)tx_mz->addr;
        txq->tx_ring_phys_addr = tx_mz->iova;
 
-       hns3_dbg(hw, "No.%u tx descriptors iova 0x%" PRIx64, q_info->idx,
-                txq->tx_ring_phys_addr);
-
        /* Clear tx bd */
        desc = txq->tx_ring;
        for (i = 0; i < txq->nb_tx_desc; i++) {
@@ -4389,14 +4380,6 @@ hns3_get_tx_function(struct rte_eth_dev *dev, eth_tx_prep_t *prep)
        return hns3_xmit_pkts;
 }
 
-uint16_t
-hns3_dummy_rxtx_burst(void *dpdk_txq __rte_unused,
-                     struct rte_mbuf **pkts __rte_unused,
-                     uint16_t pkts_n __rte_unused)
-{
-       return 0;
-}
-
 static void
 hns3_trace_rxtx_function(struct rte_eth_dev *dev)
 {
@@ -4438,14 +4421,14 @@ hns3_set_rxtx_function(struct rte_eth_dev *eth_dev)
                eth_dev->rx_pkt_burst = hns3_get_rx_function(eth_dev);
                eth_dev->rx_descriptor_status = hns3_dev_rx_descriptor_status;
                eth_dev->tx_pkt_burst = hw->set_link_down ?
-                                       hns3_dummy_rxtx_burst :
+                                       rte_eth_pkt_burst_dummy :
                                        hns3_get_tx_function(eth_dev, &prep);
                eth_dev->tx_pkt_prepare = prep;
                eth_dev->tx_descriptor_status = hns3_dev_tx_descriptor_status;
                hns3_trace_rxtx_function(eth_dev);
        } else {
-               eth_dev->rx_pkt_burst = hns3_dummy_rxtx_burst;
-               eth_dev->tx_pkt_burst = hns3_dummy_rxtx_burst;
+               eth_dev->rx_pkt_burst = rte_eth_pkt_burst_dummy;
+               eth_dev->tx_pkt_burst = rte_eth_pkt_burst_dummy;
                eth_dev->tx_pkt_prepare = NULL;
        }
 
@@ -4638,7 +4621,7 @@ hns3_tx_done_cleanup(void *txq, uint32_t free_cnt)
 
        if (dev->tx_pkt_burst == hns3_xmit_pkts)
                return hns3_tx_done_cleanup_full(q, free_cnt);
-       else if (dev->tx_pkt_burst == hns3_dummy_rxtx_burst)
+       else if (dev->tx_pkt_burst == rte_eth_pkt_burst_dummy)
                return 0;
        else
                return -ENOTSUP;
@@ -4748,7 +4731,7 @@ hns3_enable_rxd_adv_layout(struct hns3_hw *hw)
 void
 hns3_stop_tx_datapath(struct rte_eth_dev *dev)
 {
-       dev->tx_pkt_burst = hns3_dummy_rxtx_burst;
+       dev->tx_pkt_burst = rte_eth_pkt_burst_dummy;
        dev->tx_pkt_prepare = NULL;
        hns3_eth_dev_fp_ops_config(dev);