bnx2x: fix build with debug enabled

[dpdk.git] / drivers / net / vmxnet3 / vmxnet3_rxtx.c

diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index be982d5..39ad6ef 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -83,16 +83,16 @@
 #define RTE_MBUF_DATA_DMA_ADDR_DEFAULT(mb) \
        (uint64_t) ((mb)->buf_physaddr + RTE_PKTMBUF_HEADROOM)
 
-static uint32_t rxprod_reg[2] = {VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2};
+static const uint32_t rxprod_reg[2] = {VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2};
 
-static inline int vmxnet3_post_rx_bufs(vmxnet3_rx_queue_t* , uint8_t);
-static inline void vmxnet3_tq_tx_complete(vmxnet3_tx_queue_t *);
+static int vmxnet3_post_rx_bufs(vmxnet3_rx_queue_t*, uint8_t);
+static void vmxnet3_tq_tx_complete(vmxnet3_tx_queue_t *);
 #ifdef RTE_LIBRTE_VMXNET3_DEBUG_DRIVER_NOT_USED
 static void vmxnet3_rxq_dump(struct vmxnet3_rx_queue *);
 static void vmxnet3_txq_dump(struct vmxnet3_tx_queue *);
 #endif
 
-static inline struct rte_mbuf *
+static struct rte_mbuf *
 rte_rxmbuf_alloc(struct rte_mempool *mp)
 {
        struct rte_mbuf *m;
@@ -156,7 +156,7 @@ vmxnet3_txq_dump(struct vmxnet3_tx_queue *txq)
 }
 #endif
 
-static inline void
+static void
 vmxnet3_cmd_ring_release_mbufs(vmxnet3_cmd_ring_t *ring)
 {
        while (ring->next2comp != ring->next2fill) {
@@ -295,7 +295,7 @@ vmxnet3_dev_clear_queues(struct rte_eth_dev *dev)
        }
 }
 
-static inline void
+static void
 vmxnet3_tq_tx_complete(vmxnet3_tx_queue_t *txq)
 {
        int completed = 0;
@@ -306,9 +306,7 @@ vmxnet3_tq_tx_complete(vmxnet3_tx_queue_t *txq)
 
        while (tcd->gen == comp_ring->gen) {
                /* Release cmd_ring descriptor and free mbuf */
-#ifdef RTE_LIBRTE_VMXNET3_DEBUG_DRIVER
                VMXNET3_ASSERT(txq->cmd_ring.base[tcd->txdIdx].txd.eop == 1);
-#endif
                while (txq->cmd_ring.next2comp != tcd->txdIdx) {
                        mbuf = txq->cmd_ring.buf_info[txq->cmd_ring.next2comp].m;
                        txq->cmd_ring.buf_info[txq->cmd_ring.next2comp].m = NULL;
@@ -434,7 +432,7 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
  *      only for LRO.
  *
  */
-static inline int
+static int
 vmxnet3_post_rx_bufs(vmxnet3_rx_queue_t *rxq, uint8_t ring_id)
 {
        int err = 0;
@@ -522,9 +520,17 @@ vmxnet3_rx_offload(const Vmxnet3_RxCompDesc *rcd, struct rte_mbuf *rxm)
                struct ipv4_hdr *ip = (struct ipv4_hdr *)(eth + 1);
 
                if (((ip->version_ihl & 0xf) << 2) > (int)sizeof(struct ipv4_hdr))
+#ifdef RTE_NEXT_ABI
+                       rxm->packet_type = RTE_PTYPE_L3_IPV4_EXT;
+#else
                        rxm->ol_flags |= PKT_RX_IPV4_HDR_EXT;
+#endif
                else
+#ifdef RTE_NEXT_ABI
+                       rxm->packet_type = RTE_PTYPE_L3_IPV4;
+#else
                        rxm->ol_flags |= PKT_RX_IPV4_HDR;
+#endif
 
                if (!rcd->cnc) {
                        if (!rcd->ipc)
@@ -585,16 +591,13 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 
                PMD_RX_LOG(DEBUG, "rxd idx: %d ring idx: %d.", idx, ring_idx);
 
-#ifdef RTE_LIBRTE_VMXNET3_DEBUG_DRIVER
                VMXNET3_ASSERT(rcd->len <= rxd->len);
                VMXNET3_ASSERT(rbi->m);
-#endif
+
                if (unlikely(rcd->len == 0)) {
                        PMD_RX_LOG(DEBUG, "Rx buf was skipped. rxring[%d][%d]\n)",
                                   ring_idx, idx);
-#ifdef RTE_LIBRTE_VMXNET3_DEBUG_DRIVER
                        VMXNET3_ASSERT(rcd->sop && rcd->eop);
-#endif
                        rte_pktmbuf_free_seg(rbi->m);
                        goto rcd_done;
                }
@@ -607,9 +610,8 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                        rte_pktmbuf_free_seg(rbi->m);
                        goto rcd_done;
                }
-#ifdef RTE_LIBRTE_VMXNET3_DEBUG_DRIVER
                VMXNET3_ASSERT(rxd->btype == VMXNET3_RXD_BTYPE_HEAD);
-#endif
+
                /* Get the packet buffer pointer from buf_info */
                rxm = rbi->m;