mbuf: get DMA address

[dpdk.git] / drivers / net / nfp / nfp_net.c

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index bc2089f..9c4f218 100644 (file)
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -1070,9 +1070,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        };
 
        dev_info->reta_size = NFP_NET_CFG_RSS_ITBL_SZ;
-#if RTE_VER_MAJOR == 2 && RTE_VER_MINOR >= 1
        dev_info->hash_key_size = NFP_NET_CFG_RSS_KEY_SZ;
-#endif
 }
 
 static uint32_t
@@ -1275,7 +1273,7 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
            (nb_desc > NFP_NET_MAX_RX_DESC) ||
            (nb_desc < NFP_NET_MIN_RX_DESC)) {
                RTE_LOG(ERR, PMD, "Wrong nb_desc value\n");
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        /*
@@ -1291,7 +1289,7 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
        rxq = rte_zmalloc_socket("ethdev RX queue", sizeof(struct nfp_net_rxq),
                                 RTE_CACHE_LINE_SIZE, socket_id);
        if (rxq == NULL)
-               return (-ENOMEM);
+               return -ENOMEM;
 
        /* Hw queues mapping based on firmware confifguration */
        rxq->qidx = queue_idx;
@@ -1328,7 +1326,7 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
        if (tz == NULL) {
                RTE_LOG(ERR, PMD, "Error allocatig rx dma\n");
                nfp_net_rx_queue_release(rxq);
-               return (-ENOMEM);
+               return -ENOMEM;
        }
 
        /* Saving physical and virtual addresses for the RX ring */
@@ -1341,7 +1339,7 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
                                         RTE_CACHE_LINE_SIZE, socket_id);
        if (rxq->rxbufs == NULL) {
                nfp_net_rx_queue_release(rxq);
-               return (-ENOMEM);
+               return -ENOMEM;
        }
 
        PMD_RX_LOG(DEBUG, "rxbufs=%p hw_ring=%p dma_addr=0x%" PRIx64 "\n",
@@ -1379,7 +1377,7 @@ nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq)
                if (mbuf == NULL) {
                        RTE_LOG(ERR, PMD, "RX mbuf alloc failed queue_id=%u\n",
                                (unsigned)rxq->qidx);
-                       return (-ENOMEM);
+                       return -ENOMEM;
                }
 
                dma_addr = rte_cpu_to_le_64(RTE_MBUF_DMA_ADDR_DEFAULT(mbuf));
@@ -1457,7 +1455,7 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
                                 RTE_CACHE_LINE_SIZE, socket_id);
        if (txq == NULL) {
                RTE_LOG(ERR, PMD, "Error allocating tx dma\n");
-               return (-ENOMEM);
+               return -ENOMEM;
        }
 
        /*
@@ -1471,7 +1469,7 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
        if (tz == NULL) {
                RTE_LOG(ERR, PMD, "Error allocating tx dma\n");
                nfp_net_tx_queue_release(txq);
-               return (-ENOMEM);
+               return -ENOMEM;
        }
 
        txq->tx_count = nb_desc;
@@ -1499,7 +1497,7 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
                                         RTE_CACHE_LINE_SIZE, socket_id);
        if (txq->txbufs == NULL) {
                nfp_net_tx_queue_release(txq);
-               return (-ENOMEM);
+               return -ENOMEM;
        }
        PMD_TX_LOG(DEBUG, "txbufs=%p hw_ring=%p dma_addr=0x%" PRIx64 "\n",
                   txq->txbufs, txq->txds, (unsigned long int)txq->dma);
@@ -1987,7 +1985,7 @@ nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
                                rte_pktmbuf_free_seg(*lmbuf);
 
                        dma_size = pkt->data_len;
-                       dma_addr = RTE_MBUF_DATA_DMA_ADDR(pkt);
+                       dma_addr = rte_mbuf_data_dma_addr(pkt);
                        PMD_TX_LOG(DEBUG, "Working with mbuf at dma address:"
                                   "%" PRIx64 "\n", dma_addr);