From: Helin Zhang <helin.zhang@intel.com>
Date: Thu, 9 Jul 2015 16:31:29 +0000 (+0800)
Subject: vmxnet3: replace some offload flags with packet type
X-Git-Tag: spdx-start~8744
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=15072df01db6ebebdcb1ffe9d459072ce23f5d34;p=dpdk.git

vmxnet3: replace some offload flags with packet type

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

To avoid breaking ABI compatibility, all the changes would be
enabled by RTE_NEXT_ABI.

Signed-off-by: Helin Zhang <helin.zhang@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---

diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index c0cbacb7cf..39ad6ef841 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -520,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)