From mboxrd@z Thu Jan 1 00:00:00 1970 From: Helin Zhang Subject: [PATCH v6 14/18] examples/ip_reassembly: replace bit mask based packet type with unified packet type Date: Mon, 1 Jun 2015 15:34:01 +0800 Message-ID: <1433144045-30847-15-git-send-email-helin.zhang@intel.com> References: <1432284264-17376-1-git-send-email-helin.zhang@intel.com> <1433144045-30847-1-git-send-email-helin.zhang@intel.com> To: dev@dpdk.org Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 378A9C300 for ; Mon, 1 Jun 2015 09:34:54 +0200 (CEST) In-Reply-To: <1433144045-30847-1-git-send-email-helin.zhang@intel.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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_UNIFIED_PKT_TYPE, which is disabled by default. Signed-off-by: Helin Zhang --- examples/ip_reassembly/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) v2 changes: * Used redefined packet types and enlarged packet_type field in mbuf. v5 changes: * Re-worded the commit logs. v6 changes: * Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility. diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c index 9ecb6f9..cb131f6 100644 --- a/examples/ip_reassembly/main.c +++ b/examples/ip_reassembly/main.c @@ -356,7 +356,11 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, dst_port = portid; /* if packet is IPv4 */ +#ifdef RTE_UNIFIED_PKT_TYPE + if (RTE_ETH_IS_IPV4_HDR(m->packet_type)) { +#else if (m->ol_flags & (PKT_RX_IPV4_HDR)) { +#endif struct ipv4_hdr *ip_hdr; uint32_t ip_dst; @@ -396,9 +400,14 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, } eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv4); +#ifdef RTE_UNIFIED_PKT_TYPE + } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) { + /* if packet is IPv6 */ +#else } /* if packet is IPv6 */ else if (m->ol_flags & (PKT_RX_IPV6_HDR | PKT_RX_IPV6_HDR_EXT)) { +#endif struct ipv6_extension_fragment *frag_hdr; struct ipv6_hdr *ip_hdr; -- 1.9.3