From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <hzhan75@shecgisg004.sh.intel.com>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
by dpdk.org (Postfix) with ESMTP id 29E59ADA7
for <dev@dpdk.org>; Mon, 1 Jun 2015 09:35:00 +0200 (CEST)
Received: from orsmga001.jf.intel.com ([10.7.209.18])
by fmsmga102.fm.intel.com with ESMTP; 01 Jun 2015 00:34:59 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.13,531,1427785200"; d="scan'208";a="703143090"
Received: from shvmail01.sh.intel.com ([10.239.29.42])
by orsmga001.jf.intel.com with ESMTP; 01 Jun 2015 00:34:57 -0700
Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com
[10.239.29.89])
by shvmail01.sh.intel.com with ESMTP id t517YsUK007903;
Mon, 1 Jun 2015 15:34:54 +0800
Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1])
by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id
t517YoeH030995; Mon, 1 Jun 2015 15:34:52 +0800
Received: (from hzhan75@localhost)
by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t517YopY030991;
Mon, 1 Jun 2015 15:34:50 +0800
From: Helin Zhang <helin.zhang@intel.com>
To: dev@dpdk.org
Date: Mon, 1 Jun 2015 15:34:03 +0800
Message-Id: <1433144045-30847-17-git-send-email-helin.zhang@intel.com>
X-Mailer: git-send-email 1.7.4.1
In-Reply-To: <1433144045-30847-1-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>
Subject: [dpdk-dev] [PATCH v6 16/18] examples/l3fwd-power: replace bit mask
based packet type with unified packet type
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jun 2015 07:35:00 -0000
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 <helin.zhang@intel.com>
---
examples/l3fwd-power/main.c | 8 ++++++++
1 file changed, 8 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/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 6ac342b..e27ad4e 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -635,7 +635,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid,
eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
+#ifdef RTE_UNIFIED_PKT_TYPE
+ if (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {
+#else
if (m->ol_flags & PKT_RX_IPV4_HDR) {
+#endif
/* Handle IPv4 headers.*/
ipv4_hdr =
(struct ipv4_hdr *)(rte_pktmbuf_mtod(m, unsigned char*)
@@ -670,8 +674,12 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid,
ether_addr_copy(&ports_eth_addr[dst_port], ð_hdr->s_addr);
send_single_packet(m, dst_port);
+#ifdef RTE_UNIFIED_PKT_TYPE
+ } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {
+#else
}
else {
+#endif
/* Handle IPv6 headers.*/
#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
struct ipv6_hdr *ipv6_hdr;
--
1.9.3