vmxnet3: replace some offload flags with packet type
authorHelin Zhang <helin.zhang@intel.com>
Thu, 9 Jul 2015 16:31:29 +0000 (00:31 +0800)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Wed, 15 Jul 2015 22:57:32 +0000 (00:57 +0200)
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>
drivers/net/vmxnet3/vmxnet3_rxtx.c

index c0cbacb..39ad6ef 100644 (file)
@@ -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)