net: add rte prefix to ether defines

[dpdk.git] / drivers / net / bnxt / bnxt_rxr.c

diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index b6b72c5..303549b 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -102,25 +102,6 @@ static inline void bnxt_reuse_rx_mbuf(struct bnxt_rx_ring_info *rxr,
        rxr->rx_prod = prod;
 }
 
-#ifdef BNXT_DEBUG
-static void bnxt_reuse_ag_mbuf(struct bnxt_rx_ring_info *rxr, uint16_t cons,
-                              struct rte_mbuf *mbuf)
-{
-       uint16_t prod = rxr->ag_prod;
-       struct bnxt_sw_rx_bd *prod_rx_buf;
-       struct rx_prod_pkt_bd *prod_bd, *cons_bd;
-
-       prod_rx_buf = &rxr->ag_buf_ring[prod];
-
-       prod_rx_buf->mbuf = mbuf;
-
-       prod_bd = &rxr->ag_desc_ring[prod];
-       cons_bd = &rxr->ag_desc_ring[cons];
-
-       prod_bd->address = cons_bd->addr;
-}
-#endif
-
 static inline
 struct rte_mbuf *bnxt_consume_rx_buf(struct bnxt_rx_ring_info *rxr,
                                     uint16_t cons)
@@ -173,7 +154,7 @@ static void bnxt_tpa_start(struct bnxt_rx_queue *rxq,
        if (tpa_start1->flags2 &
            rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_META_FORMAT_VLAN)) {
                mbuf->vlan_tci = rte_le_to_cpu_32(tpa_start1->metadata);
-               mbuf->ol_flags |= PKT_RX_VLAN;
+               mbuf->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
        }
        if (likely(tpa_start1->flags2 &
                   rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_L4_CS_CALC)))
@@ -377,9 +358,6 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
        uint32_t tmp_raw_cons = *raw_cons;
        uint16_t cons, prod, cp_cons =
            RING_CMP(cpr->cp_ring_struct, tmp_raw_cons);
-#ifdef BNXT_DEBUG
-       uint16_t ag_cons;
-#endif
        struct rte_mbuf *mbuf;
        int rc = 0;
        uint8_t agg_buf = 0;
@@ -459,7 +437,7 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
                        (RX_PKT_CMPL_METADATA_VID_MASK |
                        RX_PKT_CMPL_METADATA_DE |
                        RX_PKT_CMPL_METADATA_PRI_MASK);
-               mbuf->ol_flags |= PKT_RX_VLAN;
+               mbuf->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
        }
 
        if (likely(RX_CMP_IP_CS_OK(rxcmp1)))
@@ -482,8 +460,6 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
        if (rxcmp1->errors_v2 & RX_CMP_L2_ERRORS) {
                /* Re-install the mbuf back to the rx ring */
                bnxt_reuse_rx_mbuf(rxr, cons, mbuf);
-               if (agg_buf)
-                       bnxt_reuse_ag_mbuf(rxr, ag_cons, mbuf);
 
                rc = -EIO;
                goto next_rx;
@@ -541,7 +517,9 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
        bool evt = false;
 
        /* If Rx Q was stopped return. RxQ0 cannot be stopped. */
-       if (rxq->rx_deferred_start && rxq->queue_id)
+       if (unlikely(((rxq->rx_deferred_start ||
+                      !rte_spinlock_trylock(&rxq->lock)) &&
+                     rxq->queue_id)))
                return 0;
 
        /* Handle RX burst request */
@@ -583,7 +561,7 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                 * For PMD, there is no need to keep on pushing to REARM
                 * the doorbell if there are no new completions
                 */
-               return nb_rx_pkts;
+               goto done;
        }
 
        if (prod != rxr->rx_prod)
@@ -618,16 +596,22 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                }
        }
 
+done:
+       rte_spinlock_unlock(&rxq->lock);
+
        return nb_rx_pkts;
 }
 
 void bnxt_free_rx_rings(struct bnxt *bp)
 {
        int i;
+       struct bnxt_rx_queue *rxq;
 
-       for (i = 0; i < (int)bp->rx_nr_rings; i++) {
-               struct bnxt_rx_queue *rxq = bp->rx_queues[i];
+       if (!bp->rx_queues)
+               return;
 
+       for (i = 0; i < (int)bp->rx_nr_rings; i++) {
+               rxq = bp->rx_queues[i];
                if (!rxq)
                        continue;
 
@@ -656,8 +640,8 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id)
        struct bnxt_rx_ring_info *rxr;
        struct bnxt_ring *ring;
 
-       rxq->rx_buf_use_size = BNXT_MAX_MTU + ETHER_HDR_LEN + ETHER_CRC_LEN +
-                              (2 * VLAN_TAG_SIZE);
+       rxq->rx_buf_use_size = BNXT_MAX_MTU + RTE_ETHER_HDR_LEN +
+               RTE_ETHER_CRC_LEN + (2 * VLAN_TAG_SIZE);
        rxq->rx_buf_size = rxq->rx_buf_use_size + sizeof(struct rte_mbuf);
 
        rxr = rte_zmalloc_socket("bnxt_rx_ring",