mbuf: rename deprecated VLAN flags

[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 3216a6d..30891b7 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -199,7 +199,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_PKT;
+               mbuf->ol_flags |= PKT_RX_VLAN;
        }
        if (likely(tpa_start1->flags2 &
                   rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_L4_CS_CALC)))
@@ -335,6 +335,48 @@ static inline struct rte_mbuf *bnxt_tpa_end(
        return mbuf;
 }
 
+static uint32_t
+bnxt_parse_pkt_type(struct rx_pkt_cmpl *rxcmp, struct rx_pkt_cmpl_hi *rxcmp1)
+{
+       uint32_t pkt_type = 0;
+       uint32_t t_ipcs = 0, ip = 0, ip6 = 0;
+       uint32_t tcp = 0, udp = 0, icmp = 0;
+       uint32_t vlan = 0;
+
+       vlan = !!(rxcmp1->flags2 &
+               rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_META_FORMAT_VLAN));
+       t_ipcs = !!(rxcmp1->flags2 &
+               rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_T_IP_CS_CALC));
+       ip6 = !!(rxcmp1->flags2 &
+                rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_IP_TYPE));
+       icmp = !!(rxcmp->flags_type &
+                 rte_cpu_to_le_16(RX_PKT_CMPL_FLAGS_ITYPE_ICMP));
+       tcp = !!(rxcmp->flags_type &
+                rte_cpu_to_le_16(RX_PKT_CMPL_FLAGS_ITYPE_TCP));
+       udp = !!(rxcmp->flags_type &
+                rte_cpu_to_le_16(RX_PKT_CMPL_FLAGS_ITYPE_UDP));
+       ip = !!(rxcmp->flags_type &
+               rte_cpu_to_le_16(RX_PKT_CMPL_FLAGS_ITYPE_IP));
+
+       pkt_type |= ((ip || tcp || udp || icmp) && !t_ipcs && !ip6) ?
+               RTE_PTYPE_L3_IPV4_EXT_UNKNOWN : 0;
+       pkt_type |= ((ip || tcp || udp || icmp) && !t_ipcs && ip6) ?
+               RTE_PTYPE_L3_IPV6_EXT_UNKNOWN : 0;
+       pkt_type |= (!t_ipcs &&  icmp) ? RTE_PTYPE_L4_ICMP : 0;
+       pkt_type |= (!t_ipcs &&  udp) ? RTE_PTYPE_L4_UDP : 0;
+       pkt_type |= (!t_ipcs &&  tcp) ? RTE_PTYPE_L4_TCP : 0;
+       pkt_type |= ((ip || tcp || udp || icmp) && t_ipcs && !ip6) ?
+               RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN : 0;
+       pkt_type |= ((ip || tcp || udp || icmp) && t_ipcs && ip6) ?
+               RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN : 0;
+       pkt_type |= (t_ipcs &&  icmp) ? RTE_PTYPE_INNER_L4_ICMP : 0;
+       pkt_type |= (t_ipcs &&  udp) ? RTE_PTYPE_INNER_L4_UDP : 0;
+       pkt_type |= (t_ipcs &&  tcp) ? RTE_PTYPE_INNER_L4_TCP : 0;
+       pkt_type |= vlan ? RTE_PTYPE_L2_ETHER_VLAN : 0;
+
+       return pkt_type;
+}
+
 static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
                            struct bnxt_rx_queue *rxq, uint32_t *raw_cons)
 {
@@ -368,12 +410,12 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
                                cpr->valid);
 
        cmp_type = CMP_TYPE(rxcmp);
-       if (cmp_type == RX_PKT_CMPL_TYPE_RX_L2_TPA_START) {
+       if (cmp_type == RX_TPA_START_CMPL_TYPE_RX_TPA_START) {
                bnxt_tpa_start(rxq, (struct rx_tpa_start_cmpl *)rxcmp,
                               (struct rx_tpa_start_cmpl_hi *)rxcmp1);
                rc = -EINVAL; /* Continue w/o new mbuf */
                goto next_rx;
-       } else if (cmp_type == RX_PKT_CMPL_TYPE_RX_L2_TPA_END) {
+       } else if (cmp_type == RX_TPA_END_CMPL_TYPE_RX_TPA_END) {
                mbuf = bnxt_tpa_end(rxq, &tmp_raw_cons,
                                   (struct rx_tpa_end_cmpl *)rxcmp,
                                   (struct rx_tpa_end_cmpl_hi *)rxcmp1);
@@ -395,11 +437,11 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
 
        cons = rxcmp->opaque;
        mbuf = bnxt_consume_rx_buf(rxr, cons);
-       rte_prefetch0(mbuf);
-
        if (mbuf == NULL)
                return -EBUSY;
 
+       rte_prefetch0(mbuf);
+
        mbuf->nb_segs = 1;
        mbuf->next = NULL;
        mbuf->pkt_len = rxcmp->len;
@@ -422,7 +464,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_PKT;
+               mbuf->ol_flags |= PKT_RX_VLAN;
        }
 
        if (likely(RX_CMP_IP_CS_OK(rxcmp1)))
@@ -435,6 +477,7 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
        else
                mbuf->ol_flags |= PKT_RX_L4_CKSUM_NONE;
 
+       mbuf->packet_type = bnxt_parse_pkt_type(rxcmp, rxcmp1);
 
 #ifdef BNXT_DEBUG
        if (rxcmp1->errors_v2 & RX_CMP_L2_ERRORS) {