[dpdk-dev] [PATCH v7 16/18] examples/l3fwd-power: replace bit mask based packet type with unified packet type

[Helin Zhang]

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, which is disabled by default.

Signed-off-by: Helin Zhang <helin.zhang at 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.

v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.

diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 6057059..705188f 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_NEXT_ABI
+       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], &eth_hdr->s_addr);

                send_single_packet(m, dst_port);
+#ifdef RTE_NEXT_ABI
+       } 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