To unify packet types among all PMDs, bit masks of packet type for
'ol_flags' are replaced by unified packet type.

Signed-off-by: Helin Zhang <helin.zhang at intel.com>
---
 lib/librte_pmd_enic/enic_main.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.

diff --git a/lib/librte_pmd_enic/enic_main.c b/lib/librte_pmd_enic/enic_main.c
index c66f139..701d506 100644
--- a/lib/librte_pmd_enic/enic_main.c
+++ b/lib/librte_pmd_enic/enic_main.c
@@ -423,7 +423,7 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,
                rx_pkt->pkt_len = bytes_written;

                if (ipv4) {
-                       rx_pkt->ol_flags |= PKT_RX_IPV4_HDR;
+                       rx_pkt->packet_type = RTE_PTYPE_L3_IPV4;
                        if (!csum_not_calc) {
                                if (unlikely(!ipv4_csum_ok))
                                        rx_pkt->ol_flags |= PKT_RX_IP_CKSUM_BAD;
@@ -432,7 +432,7 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,
                                        rx_pkt->ol_flags |= PKT_RX_L4_CKSUM_BAD;
                        }
                } else if (ipv6)
-                       rx_pkt->ol_flags |= PKT_RX_IPV6_HDR;
+                       rx_pkt->packet_type = RTE_PTYPE_L3_IPV6;
        } else {
                /* Header split */
                if (sop && !eop) {
@@ -445,7 +445,7 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,
                                *rx_pkt_bucket = rx_pkt;
                                rx_pkt->pkt_len = bytes_written;
                                if (ipv4) {
-                                       rx_pkt->ol_flags |= PKT_RX_IPV4_HDR;
+                                       rx_pkt->packet_type = RTE_PTYPE_L3_IPV4;
                                        if (!csum_not_calc) {
                                                if (unlikely(!ipv4_csum_ok))
                                                        rx_pkt->ol_flags |=
@@ -457,13 +457,14 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,
                                                            PKT_RX_L4_CKSUM_BAD;
                                        }
                                } else if (ipv6)
-                                       rx_pkt->ol_flags |= PKT_RX_IPV6_HDR;
+                                       rx_pkt->packet_type = RTE_PTYPE_L3_IPV6;
                        } else {
                                /* Payload */
                                hdr_rx_pkt = *rx_pkt_bucket;
                                hdr_rx_pkt->pkt_len += bytes_written;
                                if (ipv4) {
-                                       hdr_rx_pkt->ol_flags |= PKT_RX_IPV4_HDR;
+                                       hdr_rx_pkt->packet_type =
+                                               RTE_PTYPE_L3_IPV4;
                                        if (!csum_not_calc) {
                                                if (unlikely(!ipv4_csum_ok))
                                                        hdr_rx_pkt->ol_flags |=
@@ -475,7 +476,8 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,
                                                            PKT_RX_L4_CKSUM_BAD;
                                        }
                                } else if (ipv6)
-                                       hdr_rx_pkt->ol_flags |= PKT_RX_IPV6_HDR;
+                                       hdr_rx_pkt->packet_type =
+                                               RTE_PTYPE_L3_IPV6;

                        }
                }
-- 
1.9.3

Reply via email to