Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 53582,
    "url": "http://patches.dpdk.org/api/patches/53582/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190521161315.25500-12-olivier.matz@6wind.com/",
    "project": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<20190521161315.25500-12-olivier.matz@6wind.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20190521161315.25500-12-olivier.matz@6wind.com",
    "date": "2019-05-21T16:13:11",
    "name": "[11/15] net: add rte prefix to ip defines",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "658bd9e6d7f3f31375bb747e562be5e46d647ca2",
    "submitter": {
        "id": 8,
        "url": "http://patches.dpdk.org/api/people/8/?format=api",
        "name": "Olivier Matz",
        "email": "olivier.matz@6wind.com"
    },
    "delegate": {
        "id": 319,
        "url": "http://patches.dpdk.org/api/users/319/?format=api",
        "username": "fyigit",
        "first_name": "Ferruh",
        "last_name": "Yigit",
        "email": "ferruh.yigit@amd.com"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190521161315.25500-12-olivier.matz@6wind.com/mbox/",
    "series": [
        {
            "id": 4733,
            "url": "http://patches.dpdk.org/api/series/4733/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4733",
            "date": "2019-05-21T16:13:01",
            "name": "prefix network structures",
            "version": 1,
            "mbox": "http://patches.dpdk.org/series/4733/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/53582/comments/",
    "check": "warning",
    "checks": "http://patches.dpdk.org/api/patches/53582/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 7DDB76833;\n\tTue, 21 May 2019 18:13:51 +0200 (CEST)",
            "from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com\n\t[62.23.145.76]) by dpdk.org (Postfix) with ESMTP id 9C24D4C8B\n\tfor <dev@dpdk.org>; Tue, 21 May 2019 18:13:25 +0200 (CEST)",
            "from glumotte.dev.6wind.com. (unknown [10.16.0.195])\n\tby proxy.6wind.com (Postfix) with ESMTP id 74E8C2B83DE;\n\tTue, 21 May 2019 18:13:25 +0200 (CEST)"
        ],
        "From": "Olivier Matz <olivier.matz@6wind.com>",
        "To": "dev@dpdk.org",
        "Cc": "stephen@networkplumber.org,\n\tferruh.yigit@intel.com",
        "Date": "Tue, 21 May 2019 18:13:11 +0200",
        "Message-Id": "<20190521161315.25500-12-olivier.matz@6wind.com>",
        "X-Mailer": "git-send-email 2.11.0",
        "In-Reply-To": "<20190521161315.25500-1-olivier.matz@6wind.com>",
        "References": "<20190410083218.17531-1-olivier.matz@6wind.com>\n\t<20190521161315.25500-1-olivier.matz@6wind.com>",
        "Subject": "[dpdk-dev] [PATCH 11/15] net: add rte prefix to ip defines",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "Add 'RTE_' prefix to defines:\n- rename IPv4( as RTE_IPv4(.\n- rename IPV4_MAX_PKT_LEN as RTE_IPV4_MAX_PKT_LEN.\n- rename IPV4_HDR_IHL_MASK as RTE_IPV4_HDR_IHL_MASK.\n- rename IPV4_IHL_MULTIPLIER as RTE_IPV4_IHL_MULTIPLIER.\n- rename IPV4_HDR_DF_SHIFT as RTE_IPV4_HDR_DF_SHIFT.\n- rename IPV4_HDR_MF_SHIFT as RTE_IPV4_HDR_MF_SHIFT.\n- rename IPV4_HDR_FO_SHIFT as RTE_IPV4_HDR_FO_SHIFT.\n- rename IPV4_HDR_DF_FLAG as RTE_IPV4_HDR_DF_FLAG.\n- rename IPV4_HDR_MF_FLAG as RTE_IPV4_HDR_MF_FLAG.\n- rename IPV4_HDR_OFFSET_MASK as RTE_IPV4_HDR_OFFSET_MASK.\n- rename IPV4_HDR_OFFSET_UNITS as RTE_IPV4_HDR_OFFSET_UNITS.\n- rename IPV4_ANY as RTE_IPV4_ANY.\n- rename IPV4_LOOPBACK as RTE_IPV4_LOOPBACK.\n- rename IPV4_BROADCAST as RTE_IPV4_BROADCAST.\n- rename IPV4_ALLHOSTS_GROUP as RTE_IPV4_ALLHOSTS_GROUP.\n- rename IPV4_ALLRTRS_GROUP as RTE_IPV4_ALLRTRS_GROUP.\n- rename IPV4_MAX_LOCAL_GROUP as RTE_IPV4_MAX_LOCAL_GROUP.\n- rename IPV4_MIN_MCAST as RTE_IPV4_MIN_MCAST.\n- rename IPV4_MAX_MCAST as RTE_IPV4_MAX_MCAST.\n- rename IS_IPV4_MCAST as RTE_IS_IPV4_MCAST.\n- rename IPV6_HDR_FL_SHIFT as RTE_IPV6_HDR_FL_SHIFT.\n- rename IPV6_HDR_TC_SHIFT as RTE_IPV6_HDR_TC_SHIFT.\n- rename IPV6_HDR_FL_MASK as RTE_IPV6_HDR_FL_MASK.\n- rename IPV6_HDR_TC_MASK as RTE_IPV6_HDR_TC_MASK.\n\nSigned-off-by: Olivier Matz <olivier.matz@6wind.com>\n---\n app/test-acl/main.c                                |   2 +-\n app/test-pmd/cmdline_flow.c                        |   4 +-\n app/test-pmd/flowgen.c                             |   4 +-\n app/test-pmd/testpmd.c                             |   8 +-\n app/test/test_acl.c                                |   8 +-\n app/test/test_acl.h                                | 122 ++++++++++-----------\n app/test/test_efd.c                                |  20 ++--\n app/test/test_flow_classify.c                      |  10 +-\n app/test/test_hash.c                               |  20 ++--\n app/test/test_ipsec.c                              |   6 +-\n app/test/test_link_bonding_mode4.c                 |   4 +-\n app/test/test_lpm.c                                |  76 ++++++-------\n app/test/test_lpm_perf.c                           |  10 +-\n app/test/test_member.c                             |  20 ++--\n app/test/test_sched.c                              |   2 +-\n app/test/test_table_acl.c                          |   8 +-\n app/test/test_thash.c                              |  10 +-\n .../prog_guide/packet_classif_access_ctrl.rst      |   6 +-\n doc/guides/sample_app_ug/ip_frag.rst               |  16 +--\n doc/guides/sample_app_ug/ip_reassembly.rst         |  16 +--\n doc/guides/sample_app_ug/ipv4_multicast.rst        |   2 +-\n drivers/net/bonding/rte_eth_bond_pmd.c             |   4 +-\n drivers/net/ena/ena_ethdev.c                       |   2 +-\n drivers/net/i40e/i40e_flow.c                       |   4 +-\n drivers/net/ixgbe/ixgbe_rxtx.c                     |   2 +-\n drivers/net/mlx5/mlx5_flow_tcf.c                   |  16 +--\n drivers/net/mlx5/mlx5_flow_verbs.c                 |  16 +--\n drivers/net/tap/tap_bpf_program.c                  |   6 +-\n drivers/net/vmxnet3/vmxnet3_rxtx.c                 |   4 +-\n examples/flow_classify/flow_classify.c             |   2 +-\n examples/ip_fragmentation/main.c                   |  16 +--\n examples/ip_reassembly/main.c                      |  16 +--\n examples/ipsec-secgw/sa.c                          |   4 +-\n examples/ipv4_multicast/main.c                     |  32 +++---\n examples/l2fwd-crypto/main.c                       |   4 +-\n examples/l3fwd-acl/main.c                          |   2 +-\n examples/l3fwd-power/main.c                        |  24 ++--\n examples/l3fwd-vf/main.c                           |  24 ++--\n examples/l3fwd/l3fwd_em.c                          |  20 ++--\n examples/l3fwd/l3fwd_lpm.c                         |  16 +--\n examples/performance-thread/l3fwd-thread/main.c    |  32 +++---\n lib/librte_gro/gro_tcp4.c                          |   2 +-\n lib/librte_gro/gro_vxlan_tcp4.c                    |   5 +-\n lib/librte_gso/gso_common.h                        |   4 +-\n lib/librte_ip_frag/rte_ip_frag.h                   |   4 +-\n lib/librte_ip_frag/rte_ipv4_fragmentation.c        |  16 +--\n lib/librte_ip_frag/rte_ipv4_reassembly.c           |   8 +-\n lib/librte_net/rte_ip.h                            |  53 ++++-----\n lib/librte_net/rte_net.c                           |   6 +-\n lib/librte_port/rte_port_ras.c                     |   4 +-\n 50 files changed, 364 insertions(+), 358 deletions(-)",
    "diff": "diff --git a/app/test-acl/main.c b/app/test-acl/main.c\nindex b80179417..eb6294396 100644\n--- a/app/test-acl/main.c\n+++ b/app/test-acl/main.c\n@@ -625,7 +625,7 @@ parse_ipv4_net(const char *in, uint32_t *addr, uint32_t *mask_len)\n \tGET_CB_FIELD(in, d, 0, UINT8_MAX, '/');\n \tGET_CB_FIELD(in, m, 0, sizeof(uint32_t) * CHAR_BIT, 0);\n \n-\taddr[0] = IPv4(a, b, c, d);\n+\taddr[0] = RTE_IPv4(a, b, c, d);\n \tmask_len[0] = m;\n \n \treturn 0;\ndiff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex 7a1c5aba9..a3bbadd52 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -3532,12 +3532,12 @@ parse_vc_action_vxlan_encap(struct context *ctx, const struct token *token,\n \t\t\tmemcpy(&ipv6_mask_tos, &rte_flow_item_ipv6_mask,\n \t\t\t       sizeof(ipv6_mask_tos));\n \t\t\tipv6_mask_tos.hdr.vtc_flow |=\n-\t\t\t\tRTE_BE32(0xfful << IPV6_HDR_TC_SHIFT);\n+\t\t\t\tRTE_BE32(0xfful << RTE_IPV6_HDR_TC_SHIFT);\n \t\t\tipv6_mask_tos.hdr.hop_limits = 0xff;\n \t\t\taction_vxlan_encap_data->item_ipv6.hdr.vtc_flow |=\n \t\t\t\trte_cpu_to_be_32\n \t\t\t\t\t((uint32_t)vxlan_encap_conf.ip_tos <<\n-\t\t\t\t\t IPV6_HDR_TC_SHIFT);\n+\t\t\t\t\t RTE_IPV6_HDR_TC_SHIFT);\n \t\t\taction_vxlan_encap_data->item_ipv6.hdr.hop_limits =\n \t\t\t\t\tvxlan_encap_conf.ip_ttl;\n \t\t\taction_vxlan_encap_data->items[2].mask =\ndiff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c\nindex 989d86f89..adfbc520a 100644\n--- a/app/test-pmd/flowgen.c\n+++ b/app/test-pmd/flowgen.c\n@@ -72,8 +72,8 @@\n \n /* hardcoded configuration (for now) */\n static unsigned cfg_n_flows\t= 1024;\n-static uint32_t cfg_ip_src\t= IPv4(10, 254, 0, 0);\n-static uint32_t cfg_ip_dst\t= IPv4(10, 253, 0, 0);\n+static uint32_t cfg_ip_src\t= RTE_IPv4(10, 254, 0, 0);\n+static uint32_t cfg_ip_dst\t= RTE_IPv4(10, 253, 0, 0);\n static uint16_t cfg_udp_src\t= 1000;\n static uint16_t cfg_udp_dst\t= 1001;\n static struct rte_ether_addr cfg_ether_src =\ndiff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c\nindex 55e1b9d27..0148b0a77 100644\n--- a/app/test-pmd/testpmd.c\n+++ b/app/test-pmd/testpmd.c\n@@ -480,8 +480,8 @@ struct vxlan_encap_conf vxlan_encap_conf = {\n \t.vni = \"\\x00\\x00\\x00\",\n \t.udp_src = 0,\n \t.udp_dst = RTE_BE16(4789),\n-\t.ipv4_src = IPv4(127, 0, 0, 1),\n-\t.ipv4_dst = IPv4(255, 255, 255, 255),\n+\t.ipv4_src = RTE_IPv4(127, 0, 0, 1),\n+\t.ipv4_dst = RTE_IPv4(255, 255, 255, 255),\n \t.ipv6_src = \"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\"\n \t\t\"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x01\",\n \t.ipv6_dst = \"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\"\n@@ -497,8 +497,8 @@ struct nvgre_encap_conf nvgre_encap_conf = {\n \t.select_ipv4 = 1,\n \t.select_vlan = 0,\n \t.tni = \"\\x00\\x00\\x00\",\n-\t.ipv4_src = IPv4(127, 0, 0, 1),\n-\t.ipv4_dst = IPv4(255, 255, 255, 255),\n+\t.ipv4_src = RTE_IPv4(127, 0, 0, 1),\n+\t.ipv4_dst = RTE_IPv4(255, 255, 255, 255),\n \t.ipv6_src = \"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\"\n \t\t\"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x01\",\n \t.ipv6_dst = \"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\"\ndiff --git a/app/test/test_acl.c b/app/test/test_acl.c\nindex b1f75d1bc..8663ff031 100644\n--- a/app/test/test_acl.c\n+++ b/app/test/test_acl.c\n@@ -515,15 +515,15 @@ test_build_ports_range(void)\n \tstatic struct ipv4_7tuple test_data[] = {\n \t\t{\n \t\t\t.proto = 6,\n-\t\t\t.ip_src = IPv4(10, 1, 1, 1),\n-\t\t\t.ip_dst = IPv4(192, 168, 0, 33),\n+\t\t\t.ip_src = RTE_IPv4(10, 1, 1, 1),\n+\t\t\t.ip_dst = RTE_IPv4(192, 168, 0, 33),\n \t\t\t.port_dst = 53,\n \t\t\t.allow = 1,\n \t\t},\n \t\t{\n \t\t\t.proto = 6,\n-\t\t\t.ip_src = IPv4(127, 84, 33, 1),\n-\t\t\t.ip_dst = IPv4(1, 2, 3, 4),\n+\t\t\t.ip_src = RTE_IPv4(127, 84, 33, 1),\n+\t\t\t.ip_dst = RTE_IPv4(1, 2, 3, 4),\n \t\t\t.port_dst = 65281,\n \t\t\t.allow = 1,\n \t\t},\ndiff --git a/app/test/test_acl.h b/app/test/test_acl.h\nindex bbb0447a8..b071f47c3 100644\n--- a/app/test/test_acl.h\n+++ b/app/test/test_acl.h\n@@ -82,13 +82,13 @@ struct rte_acl_ipv4vlan_rule invalid_layout_rules[] = {\n \t\t{\n \t\t\t\t.data = {.userdata = 1, .category_mask = 1,\n \t\t\t\t\t.priority = 1},\n-\t\t\t\t.src_addr = IPv4(10,0,0,0),\n+\t\t\t\t.src_addr = RTE_IPv4(10,0,0,0),\n \t\t\t\t.src_mask_len = 24,\n \t\t},\n \t\t{\n \t\t\t\t.data = {.userdata = 2, .category_mask = 1,\n \t\t\t\t\t.priority = 1},\n-\t\t\t\t.dst_addr = IPv4(10,0,0,0),\n+\t\t\t\t.dst_addr = RTE_IPv4(10,0,0,0),\n \t\t\t\t.dst_mask_len = 24,\n \t\t},\n \t\t/* test src and dst ports */\n@@ -124,8 +124,8 @@ struct rte_acl_ipv4vlan_rule invalid_layout_rules[] = {\n  * results using the wrong data layout.\n  */\n struct ipv4_7tuple invalid_layout_data[] = {\n-\t\t{.ip_src = IPv4(10,0,1,0)},             /* should not match */\n-\t\t{.ip_src = IPv4(10,0,0,1), .allow = 2}, /* should match 2 */\n+\t\t{.ip_src = RTE_IPv4(10,0,1,0)},             /* should not match */\n+\t\t{.ip_src = RTE_IPv4(10,0,0,1), .allow = 2}, /* should match 2 */\n \t\t{.port_src = 100, .allow = 4},          /* should match 4 */\n \t\t{.port_dst = 0xf, .allow = 6},          /* should match 6 */\n };\n@@ -142,7 +142,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {\n \t\t{\n \t\t\t\t.data = {.userdata = 1, .category_mask = ACL_ALLOW_MASK,\n \t\t\t\t\t\t.priority = 230},\n-\t\t\t\t.dst_addr = IPv4(192,168,0,0),\n+\t\t\t\t.dst_addr = RTE_IPv4(192,168,0,0),\n \t\t\t\t.dst_mask_len = 16,\n \t\t\t\t.src_port_low = 0,\n \t\t\t\t.src_port_high = 0xffff,\n@@ -153,7 +153,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {\n \t\t{\n \t\t\t\t.data = {.userdata = 2, .category_mask = ACL_ALLOW_MASK,\n \t\t\t\t\t\t.priority = 330},\n-\t\t\t\t.dst_addr = IPv4(192,168,1,0),\n+\t\t\t\t.dst_addr = RTE_IPv4(192,168,1,0),\n \t\t\t\t.dst_mask_len = 24,\n \t\t\t\t.src_port_low = 0,\n \t\t\t\t.src_port_high = 0xffff,\n@@ -164,7 +164,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {\n \t\t{\n \t\t\t\t.data = {.userdata = 3, .category_mask = ACL_DENY_MASK,\n \t\t\t\t\t\t.priority = 230},\n-\t\t\t\t.dst_addr = IPv4(192,168,1,50),\n+\t\t\t\t.dst_addr = RTE_IPv4(192,168,1,50),\n \t\t\t\t.dst_mask_len = 32,\n \t\t\t\t.src_port_low = 0,\n \t\t\t\t.src_port_high = 0xffff,\n@@ -177,7 +177,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {\n \t\t{\n \t\t\t\t.data = {.userdata = 4, .category_mask = ACL_ALLOW_MASK,\n \t\t\t\t\t\t.priority = 240},\n-\t\t\t\t.src_addr = IPv4(10,0,0,0),\n+\t\t\t\t.src_addr = RTE_IPv4(10,0,0,0),\n \t\t\t\t.src_mask_len = 8,\n \t\t\t\t.src_port_low = 0,\n \t\t\t\t.src_port_high = 0xffff,\n@@ -188,7 +188,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {\n \t\t{\n \t\t\t\t.data = {.userdata = 5, .category_mask = ACL_ALLOW_MASK,\n \t\t\t\t\t\t.priority = 340},\n-\t\t\t\t.src_addr = IPv4(10,1,1,0),\n+\t\t\t\t.src_addr = RTE_IPv4(10,1,1,0),\n \t\t\t\t.src_mask_len = 24,\n \t\t\t\t.src_port_low = 0,\n \t\t\t\t.src_port_high = 0xffff,\n@@ -199,7 +199,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {\n \t\t{\n \t\t\t\t.data = {.userdata = 6, .category_mask = ACL_DENY_MASK,\n \t\t\t\t\t\t.priority = 240},\n-\t\t\t\t.src_addr = IPv4(10,1,1,1),\n+\t\t\t\t.src_addr = RTE_IPv4(10,1,1,1),\n \t\t\t\t.src_mask_len = 32,\n \t\t\t\t.src_port_low = 0,\n \t\t\t\t.src_port_high = 0xffff,\n@@ -393,9 +393,9 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {\n \t\t\t\t.data = {.userdata = 24, .category_mask = ACL_ALLOW_MASK,\n \t\t\t\t\t\t.priority = 400},\n \t\t\t\t/** make sure that unmasked bytes don't fail! */\n-\t\t\t\t.dst_addr = IPv4(1,2,3,4),\n+\t\t\t\t.dst_addr = RTE_IPv4(1,2,3,4),\n \t\t\t\t.dst_mask_len = 16,\n-\t\t\t\t.src_addr = IPv4(5,6,7,8),\n+\t\t\t\t.src_addr = RTE_IPv4(5,6,7,8),\n \t\t\t\t.src_mask_len = 24,\n \t\t\t\t.proto = 0x5,\n \t\t\t\t.proto_mask = 0xff,\n@@ -411,9 +411,9 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {\n \t\t{\n \t\t\t\t.data = {.userdata = 25, .category_mask = ACL_DENY_MASK,\n \t\t\t\t\t\t.priority = 400},\n-\t\t\t\t.dst_addr = IPv4(5,6,7,8),\n+\t\t\t\t.dst_addr = RTE_IPv4(5,6,7,8),\n \t\t\t\t.dst_mask_len = 24,\n-\t\t\t\t.src_addr = IPv4(1,2,3,4),\n+\t\t\t\t.src_addr = RTE_IPv4(1,2,3,4),\n \t\t\t\t.src_mask_len = 16,\n \t\t\t\t.proto = 0x5,\n \t\t\t\t.proto_mask = 0xff,\n@@ -429,9 +429,9 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {\n \t\t{\n \t\t\t\t.data = {.userdata = 26, .category_mask = ACL_ALLOW_MASK,\n \t\t\t\t\t\t.priority = 500},\n-\t\t\t\t.dst_addr = IPv4(1,2,3,4),\n+\t\t\t\t.dst_addr = RTE_IPv4(1,2,3,4),\n \t\t\t\t.dst_mask_len = 8,\n-\t\t\t\t.src_addr = IPv4(5,6,7,8),\n+\t\t\t\t.src_addr = RTE_IPv4(5,6,7,8),\n \t\t\t\t.src_mask_len = 32,\n \t\t\t\t.proto = 0x5,\n \t\t\t\t.proto_mask = 0xff,\n@@ -445,9 +445,9 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {\n \t\t{\n \t\t\t\t.data = {.userdata = 27, .category_mask = ACL_DENY_MASK,\n \t\t\t\t\t\t.priority = 500},\n-\t\t\t\t.dst_addr = IPv4(5,6,7,8),\n+\t\t\t\t.dst_addr = RTE_IPv4(5,6,7,8),\n \t\t\t\t.dst_mask_len = 32,\n-\t\t\t\t.src_addr = IPv4(1,2,3,4),\n+\t\t\t\t.src_addr = RTE_IPv4(1,2,3,4),\n \t\t\t\t.src_mask_len = 8,\n \t\t\t\t.proto = 0x5,\n \t\t\t\t.proto_mask = 0xff,\n@@ -463,20 +463,20 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {\n /* data for ACL unit test */\n struct ipv4_7tuple acl_test_data[] = {\n /* testing single rule aspects */\n-\t\t{.ip_src = IPv4(10,0,0,0), .allow = 4}, /* should match 4 */\n-\t\t{.ip_src = IPv4(10,1,1,2), .allow = 5}, /* should match 5 */\n-\t\t{.ip_src = IPv4(10,1,1,1), .allow = 5,\n+\t\t{.ip_src = RTE_IPv4(10,0,0,0), .allow = 4}, /* should match 4 */\n+\t\t{.ip_src = RTE_IPv4(10,1,1,2), .allow = 5}, /* should match 5 */\n+\t\t{.ip_src = RTE_IPv4(10,1,1,1), .allow = 5,\n \t\t\t\t.deny = 6},                     /* should match 5, 6 */\n-\t\t{.ip_dst = IPv4(10,0,0,0)},             /* should not match */\n-\t\t{.ip_dst = IPv4(10,1,1,2)},             /* should not match */\n-\t\t{.ip_dst = IPv4(10,1,1,1)},             /* should not match */\n+\t\t{.ip_dst = RTE_IPv4(10,0,0,0)},             /* should not match */\n+\t\t{.ip_dst = RTE_IPv4(10,1,1,2)},             /* should not match */\n+\t\t{.ip_dst = RTE_IPv4(10,1,1,1)},             /* should not match */\n \n-\t\t{.ip_src = IPv4(192,168,2,50)},             /* should not match */\n-\t\t{.ip_src = IPv4(192,168,1,2)},              /* should not match */\n-\t\t{.ip_src = IPv4(192,168,1,50)},             /* should not match */\n-\t\t{.ip_dst = IPv4(192,168,2,50), .allow = 1}, /* should match 1 */\n-\t\t{.ip_dst = IPv4(192,168,1,49), .allow = 2}, /* should match 2 */\n-\t\t{.ip_dst = IPv4(192,168,1,50), .allow = 2,\n+\t\t{.ip_src = RTE_IPv4(192,168,2,50)},             /* should not match */\n+\t\t{.ip_src = RTE_IPv4(192,168,1,2)},              /* should not match */\n+\t\t{.ip_src = RTE_IPv4(192,168,1,50)},             /* should not match */\n+\t\t{.ip_dst = RTE_IPv4(192,168,2,50), .allow = 1}, /* should match 1 */\n+\t\t{.ip_dst = RTE_IPv4(192,168,1,49), .allow = 2}, /* should match 2 */\n+\t\t{.ip_dst = RTE_IPv4(192,168,1,50), .allow = 2,\n \t\t\t\t.deny = 3},                         /* should match 2, 3 */\n \n \t\t{.vlan = 0x64, .allow = 7},            /* should match 7 */\n@@ -515,20 +515,20 @@ struct ipv4_7tuple acl_test_data[] = {\n \t\t{.proto = 0x5, .allow = 22, .deny = 23},  /* should match 22, 23 */\n \n /* testing matching multiple rules at once */\n-\t\t{.vlan = 0x5, .ip_src = IPv4(10,1,1,1),\n+\t\t{.vlan = 0x5, .ip_src = RTE_IPv4(10,1,1,1),\n \t\t\t\t.allow = 5, .deny = 9},               /* should match 5, 9 */\n-\t\t{.vlan = 0x5, .ip_src = IPv4(192,168,2,50),\n+\t\t{.vlan = 0x5, .ip_src = RTE_IPv4(192,168,2,50),\n \t\t\t\t.allow = 8, .deny = 9},               /* should match 8, 9 */\n-\t\t{.vlan = 0x55, .ip_src = IPv4(192,168,1,49),\n+\t\t{.vlan = 0x55, .ip_src = RTE_IPv4(192,168,1,49),\n \t\t\t\t.allow = 8},                          /* should match 8 */\n \t\t{.port_dst = 80, .port_src = 1024,\n \t\t\t\t.allow = 13, .deny = 20},             /* should match 13,20 */\n \t\t{.port_dst = 79, .port_src = 1024,\n \t\t\t\t.allow = 14, .deny = 20},             /* should match 14,20 */\n-\t\t{.proto = 0x5, .ip_dst = IPv4(192,168,2,50),\n+\t\t{.proto = 0x5, .ip_dst = RTE_IPv4(192,168,2,50),\n \t\t\t\t.allow = 1, .deny = 23},               /* should match 1, 23 */\n \n-\t\t{.proto = 0x5, .ip_dst = IPv4(192,168,1,50),\n+\t\t{.proto = 0x5, .ip_dst = RTE_IPv4(192,168,1,50),\n \t\t\t\t.allow = 2, .deny = 23},              /* should match 2, 23 */\n \t\t{.vlan = 0x64, .domain = 0x5,\n \t\t\t\t.allow = 11, .deny = 12},             /* should match 11, 12 */\n@@ -537,16 +537,16 @@ struct ipv4_7tuple acl_test_data[] = {\n \t\t{.proto = 0x5, .port_dst = 80,\n \t\t\t\t.allow = 13, .deny = 23},             /* should match 13, 23 */\n \t\t{.proto = 0x51, .port_src = 5000},            /* should not match */\n-\t\t{.ip_src = IPv4(192,168,1,50),\n-\t\t\t\t.ip_dst = IPv4(10,0,0,0),\n+\t\t{.ip_src = RTE_IPv4(192,168,1,50),\n+\t\t\t\t.ip_dst = RTE_IPv4(10,0,0,0),\n \t\t\t\t.proto = 0x51,\n \t\t\t\t.port_src = 5000,\n \t\t\t\t.port_dst = 5000},                    /* should not match */\n \n /* test full packet rules */\n \t\t{\n-\t\t\t\t.ip_dst = IPv4(1,2,100,200),\n-\t\t\t\t.ip_src = IPv4(5,6,7,254),\n+\t\t\t\t.ip_dst = RTE_IPv4(1,2,100,200),\n+\t\t\t\t.ip_src = RTE_IPv4(5,6,7,254),\n \t\t\t\t.proto = 0x5,\n \t\t\t\t.vlan = 0x8100,\n \t\t\t\t.domain = 0x64,\n@@ -556,8 +556,8 @@ struct ipv4_7tuple acl_test_data[] = {\n \t\t\t\t.deny = 23\n \t\t}, /* should match 23, 24 */\n \t\t{\n-\t\t\t\t.ip_dst = IPv4(5,6,7,254),\n-\t\t\t\t.ip_src = IPv4(1,2,100,200),\n+\t\t\t\t.ip_dst = RTE_IPv4(5,6,7,254),\n+\t\t\t\t.ip_src = RTE_IPv4(1,2,100,200),\n \t\t\t\t.proto = 0x5,\n \t\t\t\t.vlan = 0x8100,\n \t\t\t\t.domain = 0x64,\n@@ -567,8 +567,8 @@ struct ipv4_7tuple acl_test_data[] = {\n \t\t\t\t.deny = 25\n \t\t}, /* should match 13, 25 */\n \t\t{\n-\t\t\t\t.ip_dst = IPv4(1,10,20,30),\n-\t\t\t\t.ip_src = IPv4(5,6,7,8),\n+\t\t\t\t.ip_dst = RTE_IPv4(1,10,20,30),\n+\t\t\t\t.ip_src = RTE_IPv4(5,6,7,8),\n \t\t\t\t.proto = 0x5,\n \t\t\t\t.vlan = 0x64,\n \t\t\t\t.port_src = 12345,\n@@ -577,8 +577,8 @@ struct ipv4_7tuple acl_test_data[] = {\n \t\t\t\t.deny = 23\n \t\t}, /* should match 23, 26 */\n \t\t{\n-\t\t\t\t.ip_dst = IPv4(5,6,7,8),\n-\t\t\t\t.ip_src = IPv4(1,10,20,30),\n+\t\t\t\t.ip_dst = RTE_IPv4(5,6,7,8),\n+\t\t\t\t.ip_src = RTE_IPv4(1,10,20,30),\n \t\t\t\t.proto = 0x5,\n \t\t\t\t.vlan = 0x64,\n \t\t\t\t.port_src = 12345,\n@@ -587,8 +587,8 @@ struct ipv4_7tuple acl_test_data[] = {\n \t\t\t\t.deny = 27\n \t\t}, /* should match 13, 27 */\n \t\t{\n-\t\t\t\t.ip_dst = IPv4(2,2,3,4),\n-\t\t\t\t.ip_src = IPv4(4,6,7,8),\n+\t\t\t\t.ip_dst = RTE_IPv4(2,2,3,4),\n+\t\t\t\t.ip_src = RTE_IPv4(4,6,7,8),\n \t\t\t\t.proto = 0x5,\n \t\t\t\t.vlan = 0x64,\n \t\t\t\t.port_src = 12345,\n@@ -597,8 +597,8 @@ struct ipv4_7tuple acl_test_data[] = {\n \t\t\t\t.deny = 23\n \t\t}, /* should match 13, 23 */\n \t\t{\n-\t\t\t\t.ip_dst = IPv4(1,2,3,4),\n-\t\t\t\t.ip_src = IPv4(4,6,7,8),\n+\t\t\t\t.ip_dst = RTE_IPv4(1,2,3,4),\n+\t\t\t\t.ip_src = RTE_IPv4(4,6,7,8),\n \t\t\t\t.proto = 0x5,\n \t\t\t\t.vlan = 0x64,\n \t\t\t\t.port_src = 12345,\n@@ -610,8 +610,8 @@ struct ipv4_7tuple acl_test_data[] = {\n \n /* visual separator! */\n \t\t{\n-\t\t\t\t.ip_dst = IPv4(1,2,100,200),\n-\t\t\t\t.ip_src = IPv4(5,6,7,254),\n+\t\t\t\t.ip_dst = RTE_IPv4(1,2,100,200),\n+\t\t\t\t.ip_src = RTE_IPv4(5,6,7,254),\n \t\t\t\t.proto = 0x55,\n \t\t\t\t.vlan = 0x8000,\n \t\t\t\t.domain = 0x6464,\n@@ -620,8 +620,8 @@ struct ipv4_7tuple acl_test_data[] = {\n \t\t\t\t.allow = 10\n \t\t}, /* should match 10 */\n \t\t{\n-\t\t\t\t.ip_dst = IPv4(5,6,7,254),\n-\t\t\t\t.ip_src = IPv4(1,2,100,200),\n+\t\t\t\t.ip_dst = RTE_IPv4(5,6,7,254),\n+\t\t\t\t.ip_src = RTE_IPv4(1,2,100,200),\n \t\t\t\t.proto = 0x55,\n \t\t\t\t.vlan = 0x8100,\n \t\t\t\t.domain = 0x6464,\n@@ -630,8 +630,8 @@ struct ipv4_7tuple acl_test_data[] = {\n \t\t\t\t.allow = 10\n \t\t}, /* should match 10 */\n \t\t{\n-\t\t\t\t.ip_dst = IPv4(1,10,20,30),\n-\t\t\t\t.ip_src = IPv4(5,6,7,8),\n+\t\t\t\t.ip_dst = RTE_IPv4(1,10,20,30),\n+\t\t\t\t.ip_src = RTE_IPv4(5,6,7,8),\n \t\t\t\t.proto = 0x55,\n \t\t\t\t.vlan = 0x64,\n \t\t\t\t.port_src = 12345,\n@@ -639,8 +639,8 @@ struct ipv4_7tuple acl_test_data[] = {\n \t\t\t\t.allow = 7\n \t\t}, /* should match 7 */\n \t\t{\n-\t\t\t\t.ip_dst = IPv4(5,6,7,8),\n-\t\t\t\t.ip_src = IPv4(1,10,20,30),\n+\t\t\t\t.ip_dst = RTE_IPv4(5,6,7,8),\n+\t\t\t\t.ip_src = RTE_IPv4(1,10,20,30),\n \t\t\t\t.proto = 0x55,\n \t\t\t\t.vlan = 0x64,\n \t\t\t\t.port_src = 12345,\n@@ -648,8 +648,8 @@ struct ipv4_7tuple acl_test_data[] = {\n \t\t\t\t.allow = 7\n \t\t}, /* should match 7 */\n \t\t{\n-\t\t\t\t.ip_dst = IPv4(2,2,3,4),\n-\t\t\t\t.ip_src = IPv4(4,6,7,8),\n+\t\t\t\t.ip_dst = RTE_IPv4(2,2,3,4),\n+\t\t\t\t.ip_src = RTE_IPv4(4,6,7,8),\n \t\t\t\t.proto = 0x55,\n \t\t\t\t.vlan = 0x64,\n \t\t\t\t.port_src = 12345,\n@@ -657,8 +657,8 @@ struct ipv4_7tuple acl_test_data[] = {\n \t\t\t\t.allow = 7\n \t\t}, /* should match 7 */\n \t\t{\n-\t\t\t\t.ip_dst = IPv4(1,2,3,4),\n-\t\t\t\t.ip_src = IPv4(4,6,7,8),\n+\t\t\t\t.ip_dst = RTE_IPv4(1,2,3,4),\n+\t\t\t\t.ip_src = RTE_IPv4(4,6,7,8),\n \t\t\t\t.proto = 0x50,\n \t\t\t\t.vlan = 0x6466,\n \t\t\t\t.port_src = 12345,\ndiff --git a/app/test/test_efd.c b/app/test/test_efd.c\nindex 93e8f1cbb..2868712bb 100644\n--- a/app/test/test_efd.c\n+++ b/app/test/test_efd.c\n@@ -58,36 +58,36 @@ static void print_key_info(const char *msg, const struct flow_key *key,\n /* Keys used by unit test functions */\n static struct flow_key keys[5] = {\n \t{\n-\t\t.ip_src = IPv4(0x03, 0x02, 0x01, 0x00),\n-\t\t.ip_dst = IPv4(0x07, 0x06, 0x05, 0x04),\n+\t\t.ip_src = RTE_IPv4(0x03, 0x02, 0x01, 0x00),\n+\t\t.ip_dst = RTE_IPv4(0x07, 0x06, 0x05, 0x04),\n \t\t.port_src = 0x0908,\n \t\t.port_dst = 0x0b0a,\n \t\t.proto = 0x0c,\n \t},\n \t{\n-\t\t.ip_src = IPv4(0x13, 0x12, 0x11, 0x10),\n-\t\t.ip_dst = IPv4(0x17, 0x16, 0x15, 0x14),\n+\t\t.ip_src = RTE_IPv4(0x13, 0x12, 0x11, 0x10),\n+\t\t.ip_dst = RTE_IPv4(0x17, 0x16, 0x15, 0x14),\n \t\t.port_src = 0x1918,\n \t\t.port_dst = 0x1b1a,\n \t\t.proto = 0x1c,\n \t},\n \t{\n-\t\t.ip_src = IPv4(0x23, 0x22, 0x21, 0x20),\n-\t\t.ip_dst = IPv4(0x27, 0x26, 0x25, 0x24),\n+\t\t.ip_src = RTE_IPv4(0x23, 0x22, 0x21, 0x20),\n+\t\t.ip_dst = RTE_IPv4(0x27, 0x26, 0x25, 0x24),\n \t\t.port_src = 0x2928,\n \t\t.port_dst = 0x2b2a,\n \t\t.proto = 0x2c,\n \t},\n \t{\n-\t\t.ip_src = IPv4(0x33, 0x32, 0x31, 0x30),\n-\t\t.ip_dst = IPv4(0x37, 0x36, 0x35, 0x34),\n+\t\t.ip_src = RTE_IPv4(0x33, 0x32, 0x31, 0x30),\n+\t\t.ip_dst = RTE_IPv4(0x37, 0x36, 0x35, 0x34),\n \t\t.port_src = 0x3938,\n \t\t.port_dst = 0x3b3a,\n \t\t.proto = 0x3c,\n \t},\n \t{\n-\t\t.ip_src = IPv4(0x43, 0x42, 0x41, 0x40),\n-\t\t.ip_dst = IPv4(0x47, 0x46, 0x45, 0x44),\n+\t\t.ip_src = RTE_IPv4(0x43, 0x42, 0x41, 0x40),\n+\t\t.ip_dst = RTE_IPv4(0x47, 0x46, 0x45, 0x44),\n \t\t.port_src = 0x4948,\n \t\t.port_dst = 0x4b4a,\n \t\t.proto = 0x4c,\ndiff --git a/app/test/test_flow_classify.c b/app/test/test_flow_classify.c\nindex 96e371691..f2c100a0d 100644\n--- a/app/test/test_flow_classify.c\n+++ b/app/test/test_flow_classify.c\n@@ -95,7 +95,8 @@ static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {\n  *  dst mask 255.255.255.00 / udp src is 32 dst is 33 / end\"\n  */\n static struct rte_flow_item_ipv4 ipv4_udp_spec_1 = {\n-\t{ 0, 0, 0, 0, 0, 0, IPPROTO_UDP, 0, IPv4(2, 2, 2, 3), IPv4(2, 2, 2, 7)}\n+\t{ 0, 0, 0, 0, 0, 0, IPPROTO_UDP, 0,\n+\t  RTE_IPv4(2, 2, 2, 3), RTE_IPv4(2, 2, 2, 7)}\n };\n static const struct rte_flow_item_ipv4 ipv4_mask_24 = {\n \t.hdr = {\n@@ -131,7 +132,8 @@ static struct rte_flow_item  end_item_bad = { -1, 0, 0, 0 };\n  *  dst mask 255.255.255.00 / tcp src is 16 dst is 17 / end\"\n  */\n static struct rte_flow_item_ipv4 ipv4_tcp_spec_1 = {\n-\t{ 0, 0, 0, 0, 0, 0, IPPROTO_TCP, 0, IPv4(1, 2, 3, 4), IPv4(5, 6, 7, 8)}\n+\t{ 0, 0, 0, 0, 0, 0, IPPROTO_TCP, 0,\n+\t  RTE_IPv4(1, 2, 3, 4), RTE_IPv4(5, 6, 7, 8)}\n };\n \n static struct rte_flow_item_tcp tcp_spec_1 = {\n@@ -149,8 +151,8 @@ static struct rte_flow_item  tcp_item_1 = { RTE_FLOW_ITEM_TYPE_TCP,\n  *  dst mask 255.255.255.00 / sctp src is 16 dst is 17/ end\"\n  */\n static struct rte_flow_item_ipv4 ipv4_sctp_spec_1 = {\n-\t{ 0, 0, 0, 0, 0, 0, IPPROTO_SCTP, 0, IPv4(11, 12, 13, 14),\n-\tIPv4(15, 16, 17, 18)}\n+\t{ 0, 0, 0, 0, 0, 0, IPPROTO_SCTP, 0, RTE_IPv4(11, 12, 13, 14),\n+\tRTE_IPv4(15, 16, 17, 18)}\n };\n \n static struct rte_flow_item_sctp sctp_spec_1 = {\ndiff --git a/app/test/test_hash.c b/app/test/test_hash.c\nindex e16259296..8271ba792 100644\n--- a/app/test/test_hash.c\n+++ b/app/test/test_hash.c\n@@ -104,32 +104,32 @@ static void print_key_info(const char *msg, const struct flow_key *key,\n \n /* Keys used by unit test functions */\n static struct flow_key keys[5] = { {\n-\t.ip_src = IPv4(0x03, 0x02, 0x01, 0x00),\n-\t.ip_dst = IPv4(0x07, 0x06, 0x05, 0x04),\n+\t.ip_src = RTE_IPv4(0x03, 0x02, 0x01, 0x00),\n+\t.ip_dst = RTE_IPv4(0x07, 0x06, 0x05, 0x04),\n \t.port_src = 0x0908,\n \t.port_dst = 0x0b0a,\n \t.proto = 0x0c,\n }, {\n-\t.ip_src = IPv4(0x13, 0x12, 0x11, 0x10),\n-\t.ip_dst = IPv4(0x17, 0x16, 0x15, 0x14),\n+\t.ip_src = RTE_IPv4(0x13, 0x12, 0x11, 0x10),\n+\t.ip_dst = RTE_IPv4(0x17, 0x16, 0x15, 0x14),\n \t.port_src = 0x1918,\n \t.port_dst = 0x1b1a,\n \t.proto = 0x1c,\n }, {\n-\t.ip_src = IPv4(0x23, 0x22, 0x21, 0x20),\n-\t.ip_dst = IPv4(0x27, 0x26, 0x25, 0x24),\n+\t.ip_src = RTE_IPv4(0x23, 0x22, 0x21, 0x20),\n+\t.ip_dst = RTE_IPv4(0x27, 0x26, 0x25, 0x24),\n \t.port_src = 0x2928,\n \t.port_dst = 0x2b2a,\n \t.proto = 0x2c,\n }, {\n-\t.ip_src = IPv4(0x33, 0x32, 0x31, 0x30),\n-\t.ip_dst = IPv4(0x37, 0x36, 0x35, 0x34),\n+\t.ip_src = RTE_IPv4(0x33, 0x32, 0x31, 0x30),\n+\t.ip_dst = RTE_IPv4(0x37, 0x36, 0x35, 0x34),\n \t.port_src = 0x3938,\n \t.port_dst = 0x3b3a,\n \t.proto = 0x3c,\n }, {\n-\t.ip_src = IPv4(0x43, 0x42, 0x41, 0x40),\n-\t.ip_dst = IPv4(0x47, 0x46, 0x45, 0x44),\n+\t.ip_src = RTE_IPv4(0x43, 0x42, 0x41, 0x40),\n+\t.ip_dst = RTE_IPv4(0x47, 0x46, 0x45, 0x44),\n \t.port_src = 0x4948,\n \t.port_dst = 0x4b4a,\n \t.proto = 0x4c,\ndiff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c\nindex d8860fba0..606e31919 100644\n--- a/app/test/test_ipsec.c\n+++ b/app/test/test_ipsec.c\n@@ -533,11 +533,11 @@ const char null_encrypted_data[] =\n \n struct rte_ipv4_hdr ipv4_outer  = {\n \t.version_ihl = IPVERSION << 4 |\n-\t\tsizeof(ipv4_outer) / IPV4_IHL_MULTIPLIER,\n+\t\tsizeof(ipv4_outer) / RTE_IPV4_IHL_MULTIPLIER,\n \t.time_to_live = IPDEFTTL,\n \t.next_proto_id = IPPROTO_ESP,\n-\t.src_addr = IPv4(192, 168, 1, 100),\n-\t.dst_addr = IPv4(192, 168, 2, 100),\n+\t.src_addr = RTE_IPv4(192, 168, 1, 100),\n+\t.dst_addr = RTE_IPv4(192, 168, 2, 100),\n };\n \n static struct rte_mbuf *\ndiff --git a/app/test/test_link_bonding_mode4.c b/app/test/test_link_bonding_mode4.c\nindex e67bfacdd..98f9fe2fa 100644\n--- a/app/test/test_link_bonding_mode4.c\n+++ b/app/test/test_link_bonding_mode4.c\n@@ -729,8 +729,8 @@ generate_packets(struct rte_ether_addr *src_mac,\n \n \tuint16_t src_port = 10, dst_port = 20;\n \n-\tuint32_t ip_src[4] = { [0 ... 2] = 0xDEADBEEF, [3] = IPv4(192, 168, 0, 1) };\n-\tuint32_t ip_dst[4] = { [0 ... 2] = 0xFEEDFACE, [3] = IPv4(192, 168, 0, 2) };\n+\tuint32_t ip_src[4] = { [0 ... 2] = 0xDEADBEEF, [3] = RTE_IPv4(192, 168, 0, 1) };\n+\tuint32_t ip_dst[4] = { [0 ... 2] = 0xFEEDFACE, [3] = RTE_IPv4(192, 168, 0, 2) };\n \n \tstruct rte_ether_hdr pkt_eth_hdr;\n \tstruct udp_hdr pkt_udp_hdr;\ndiff --git a/app/test/test_lpm.c b/app/test/test_lpm.c\nindex 5d697dd0f..0f24631ac 100644\n--- a/app/test/test_lpm.c\n+++ b/app/test/test_lpm.c\n@@ -165,7 +165,7 @@ test3(void)\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\n-\tuint32_t ip = IPv4(0, 0, 0, 0), next_hop = 100;\n+\tuint32_t ip = RTE_IPv4(0, 0, 0, 0), next_hop = 100;\n \tuint8_t depth = 24;\n \tint32_t status = 0;\n \n@@ -203,7 +203,7 @@ test4(void)\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\n-\tuint32_t ip = IPv4(0, 0, 0, 0);\n+\tuint32_t ip = RTE_IPv4(0, 0, 0, 0);\n \tuint8_t depth = 24;\n \tint32_t status = 0;\n \n@@ -242,7 +242,7 @@ test5(void)\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\n-\tuint32_t ip = IPv4(0, 0, 0, 0), next_hop_return = 0;\n+\tuint32_t ip = RTE_IPv4(0, 0, 0, 0), next_hop_return = 0;\n \tint32_t status = 0;\n \n \t/* rte_lpm_lookup: lpm == NULL */\n@@ -276,7 +276,7 @@ test6(void)\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\n-\tuint32_t ip = IPv4(0, 0, 0, 0), next_hop_add = 100, next_hop_return = 0;\n+\tuint32_t ip = RTE_IPv4(0, 0, 0, 0), next_hop_add = 100, next_hop_return = 0;\n \tuint8_t depth = 24;\n \tint32_t status = 0;\n \n@@ -315,7 +315,7 @@ test7(void)\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\n-\tuint32_t ip = IPv4(0, 0, 0, 0), next_hop_add = 100, next_hop_return = 0;\n+\tuint32_t ip = RTE_IPv4(0, 0, 0, 0), next_hop_add = 100, next_hop_return = 0;\n \tuint8_t depth = 32;\n \tint32_t status = 0;\n \n@@ -366,7 +366,7 @@ test8(void)\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\n-\tuint32_t ip1 = IPv4(127, 255, 255, 255), ip2 = IPv4(128, 0, 0, 0);\n+\tuint32_t ip1 = RTE_IPv4(127, 255, 255, 255), ip2 = RTE_IPv4(128, 0, 0, 0);\n \tuint32_t next_hop_add, next_hop_return;\n \tuint8_t depth;\n \tint32_t status = 0;\n@@ -457,7 +457,7 @@ test9(void)\n \tint32_t status = 0;\n \n \t/* Add & lookup to hit invalid TBL24 entry */\n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 24;\n \tnext_hop_add = 100;\n \n@@ -479,7 +479,7 @@ test9(void)\n \trte_lpm_delete_all(lpm);\n \n \t/* Add & lookup to hit valid TBL24 entry not extended */\n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 23;\n \tnext_hop_add = 100;\n \n@@ -515,7 +515,7 @@ test9(void)\n \n \t/* Add & lookup to hit valid extended TBL24 entry with invalid TBL8\n \t * entry */\n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 32;\n \tnext_hop_add = 100;\n \n@@ -525,7 +525,7 @@ test9(void)\n \tstatus = rte_lpm_lookup(lpm, ip, &next_hop_return);\n \tTEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));\n \n-\tip = IPv4(128, 0, 0, 5);\n+\tip = RTE_IPv4(128, 0, 0, 5);\n \tdepth = 32;\n \tnext_hop_add = 101;\n \n@@ -541,7 +541,7 @@ test9(void)\n \tstatus = rte_lpm_lookup(lpm, ip, &next_hop_return);\n \tTEST_LPM_ASSERT(status == -ENOENT);\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 32;\n \tnext_hop_add = 100;\n \n@@ -558,11 +558,11 @@ test9(void)\n \n \t/* Add & lookup to hit valid extended TBL24 entry with valid TBL8\n \t * entry */\n-\tip_1 = IPv4(128, 0, 0, 0);\n+\tip_1 = RTE_IPv4(128, 0, 0, 0);\n \tdepth_1 = 25;\n \tnext_hop_add_1 = 101;\n \n-\tip_2 = IPv4(128, 0, 0, 5);\n+\tip_2 = RTE_IPv4(128, 0, 0, 5);\n \tdepth_2 = 32;\n \tnext_hop_add_2 = 102;\n \n@@ -629,7 +629,7 @@ test10(void)\n \tlpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);\n \tTEST_LPM_ASSERT(lpm != NULL);\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 16;\n \tnext_hop_add = 100;\n \n@@ -647,7 +647,7 @@ test10(void)\n \n \trte_lpm_delete_all(lpm);\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 25;\n \tnext_hop_add = 100;\n \n@@ -665,14 +665,14 @@ test10(void)\n \t/* Add rule that extends a TBL24 valid entry & lookup for both rules\n \t * (& delete & lookup) */\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 24;\n \tnext_hop_add = 100;\n \n \tstatus = rte_lpm_add(lpm, ip, depth, next_hop_add);\n \tTEST_LPM_ASSERT(status == 0);\n \n-\tip = IPv4(128, 0, 0, 10);\n+\tip = RTE_IPv4(128, 0, 0, 10);\n \tdepth = 32;\n \tnext_hop_add = 101;\n \n@@ -682,13 +682,13 @@ test10(void)\n \tstatus = rte_lpm_lookup(lpm, ip, &next_hop_return);\n \tTEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tnext_hop_add = 100;\n \n \tstatus = rte_lpm_lookup(lpm, ip, &next_hop_return);\n \tTEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 24;\n \n \tstatus = rte_lpm_delete(lpm, ip, depth);\n@@ -697,7 +697,7 @@ test10(void)\n \tstatus = rte_lpm_lookup(lpm, ip, &next_hop_return);\n \tTEST_LPM_ASSERT(status == -ENOENT);\n \n-\tip = IPv4(128, 0, 0, 10);\n+\tip = RTE_IPv4(128, 0, 0, 10);\n \tdepth = 32;\n \n \tstatus = rte_lpm_delete(lpm, ip, depth);\n@@ -711,7 +711,7 @@ test10(void)\n \t/* Add rule that updates the next hop in TBL24 & lookup\n \t * (& delete & lookup) */\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 24;\n \tnext_hop_add = 100;\n \n@@ -740,7 +740,7 @@ test10(void)\n \t/* Add rule that updates the next hop in TBL8 & lookup\n \t * (& delete & lookup) */\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 32;\n \tnext_hop_add = 100;\n \n@@ -768,7 +768,7 @@ test10(void)\n \n \t/* Delete a rule that is not present in the TBL24 & lookup */\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 24;\n \n \tstatus = rte_lpm_delete(lpm, ip, depth);\n@@ -781,7 +781,7 @@ test10(void)\n \n \t/* Delete a rule that is not present in the TBL8 & lookup */\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 32;\n \n \tstatus = rte_lpm_delete(lpm, ip, depth);\n@@ -818,14 +818,14 @@ test11(void)\n \tlpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);\n \tTEST_LPM_ASSERT(lpm != NULL);\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 24;\n \tnext_hop_add = 100;\n \n \tstatus = rte_lpm_add(lpm, ip, depth, next_hop_add);\n \tTEST_LPM_ASSERT(status == 0);\n \n-\tip = IPv4(128, 0, 0, 10);\n+\tip = RTE_IPv4(128, 0, 0, 10);\n \tdepth = 32;\n \tnext_hop_add = 101;\n \n@@ -835,13 +835,13 @@ test11(void)\n \tstatus = rte_lpm_lookup(lpm, ip, &next_hop_return);\n \tTEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tnext_hop_add = 100;\n \n \tstatus = rte_lpm_lookup(lpm, ip, &next_hop_return);\n \tTEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 24;\n \n \tstatus = rte_lpm_delete(lpm, ip, depth);\n@@ -850,7 +850,7 @@ test11(void)\n \tstatus = rte_lpm_lookup(lpm, ip, &next_hop_return);\n \tTEST_LPM_ASSERT(status == -ENOENT);\n \n-\tip = IPv4(128, 0, 0, 10);\n+\tip = RTE_IPv4(128, 0, 0, 10);\n \tdepth = 32;\n \n \tstatus = rte_lpm_delete(lpm, ip, depth);\n@@ -889,7 +889,7 @@ test12(void)\n \tlpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);\n \tTEST_LPM_ASSERT(lpm != NULL);\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 32;\n \tnext_hop_add = 100;\n \n@@ -944,7 +944,7 @@ test13(void)\n \tlpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);\n \tTEST_LPM_ASSERT(lpm != NULL);\n \n-\tip = IPv4(128, 0, 0, 0);\n+\tip = RTE_IPv4(128, 0, 0, 0);\n \tdepth = 24;\n \tnext_hop_add_1 = 100;\n \n@@ -1014,10 +1014,10 @@ test14(void)\n \n \tdepth = 32;\n \tnext_hop_add = 100;\n-\tip = IPv4(0, 0, 0, 0);\n+\tip = RTE_IPv4(0, 0, 0, 0);\n \n \t/* Add 256 rules that require a tbl8 extension */\n-\tfor (; ip <= IPv4(0, 0, 255, 0); ip += 256) {\n+\tfor (; ip <= RTE_IPv4(0, 0, 255, 0); ip += 256) {\n \t\tstatus = rte_lpm_add(lpm, ip, depth, next_hop_add);\n \t\tTEST_LPM_ASSERT(status == 0);\n \n@@ -1028,7 +1028,7 @@ test14(void)\n \n \t/* All tbl8 extensions have been used above. Try to add one more and\n \t * we get a fail */\n-\tip = IPv4(1, 0, 0, 0);\n+\tip = RTE_IPv4(1, 0, 0, 0);\n \tdepth = 32;\n \n \tstatus = rte_lpm_add(lpm, ip, depth, next_hop_add);\n@@ -1125,9 +1125,9 @@ test17(void)\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\n-\tconst uint32_t ip_10_32 = IPv4(10, 10, 10, 2);\n-\tconst uint32_t ip_10_24 = IPv4(10, 10, 10, 0);\n-\tconst uint32_t ip_20_25 = IPv4(10, 10, 20, 2);\n+\tconst uint32_t ip_10_32 = RTE_IPv4(10, 10, 10, 2);\n+\tconst uint32_t ip_10_24 = RTE_IPv4(10, 10, 10, 0);\n+\tconst uint32_t ip_20_25 = RTE_IPv4(10, 10, 20, 2);\n \tconst uint8_t d_ip_10_32 = 32,\n \t\t\td_ip_10_24 = 24,\n \t\t\td_ip_20_25 = 25;\n@@ -1221,7 +1221,7 @@ test18(void)\n \tlpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);\n \tTEST_LPM_ASSERT(lpm != NULL);\n \n-\tip = IPv4(192, 168, 100, 100);\n+\tip = RTE_IPv4(192, 168, 100, 100);\n \tdepth = 28;\n \tnext_hop = 1;\n \trte_lpm_add(lpm, ip, depth, next_hop);\ndiff --git a/app/test/test_lpm_perf.c b/app/test/test_lpm_perf.c\nindex 3b98ce0c8..b54650367 100644\n--- a/app/test/test_lpm_perf.c\n+++ b/app/test/test_lpm_perf.c\n@@ -285,11 +285,11 @@ static void generate_large_route_rule_table(void)\n \t * they are 4 rules with private local IP address and 1 all-zeros prefix\n \t * with depth = 8.\n \t */\n-\tinsert_rule_in_random_pos(IPv4(0, 0, 0, 0), 8);\n-\tinsert_rule_in_random_pos(IPv4(10, 2, 23, 147), 32);\n-\tinsert_rule_in_random_pos(IPv4(192, 168, 100, 10), 24);\n-\tinsert_rule_in_random_pos(IPv4(192, 168, 25, 100), 24);\n-\tinsert_rule_in_random_pos(IPv4(192, 168, 129, 124), 32);\n+\tinsert_rule_in_random_pos(RTE_IPv4(0, 0, 0, 0), 8);\n+\tinsert_rule_in_random_pos(RTE_IPv4(10, 2, 23, 147), 32);\n+\tinsert_rule_in_random_pos(RTE_IPv4(192, 168, 100, 10), 24);\n+\tinsert_rule_in_random_pos(RTE_IPv4(192, 168, 25, 100), 24);\n+\tinsert_rule_in_random_pos(RTE_IPv4(192, 168, 129, 124), 32);\n }\n \n static void\ndiff --git a/app/test/test_member.c b/app/test/test_member.c\nindex e2a3932f2..53287fcaf 100644\n--- a/app/test/test_member.c\n+++ b/app/test/test_member.c\n@@ -41,36 +41,36 @@ struct flow_key {\n /* Keys used by unit test functions */\n static struct flow_key keys[NUM_SAMPLES] = {\n \t{\n-\t\t.ip_src = IPv4(0x03, 0x02, 0x01, 0x00),\n-\t\t.ip_dst = IPv4(0x07, 0x06, 0x05, 0x04),\n+\t\t.ip_src = RTE_IPv4(0x03, 0x02, 0x01, 0x00),\n+\t\t.ip_dst = RTE_IPv4(0x07, 0x06, 0x05, 0x04),\n \t\t.port_src = 0x0908,\n \t\t.port_dst = 0x0b0a,\n \t\t.proto = 0x0c,\n \t},\n \t{\n-\t\t.ip_src = IPv4(0x13, 0x12, 0x11, 0x10),\n-\t\t.ip_dst = IPv4(0x17, 0x16, 0x15, 0x14),\n+\t\t.ip_src = RTE_IPv4(0x13, 0x12, 0x11, 0x10),\n+\t\t.ip_dst = RTE_IPv4(0x17, 0x16, 0x15, 0x14),\n \t\t.port_src = 0x1918,\n \t\t.port_dst = 0x1b1a,\n \t\t.proto = 0x1c,\n \t},\n \t{\n-\t\t.ip_src = IPv4(0x23, 0x22, 0x21, 0x20),\n-\t\t.ip_dst = IPv4(0x27, 0x26, 0x25, 0x24),\n+\t\t.ip_src = RTE_IPv4(0x23, 0x22, 0x21, 0x20),\n+\t\t.ip_dst = RTE_IPv4(0x27, 0x26, 0x25, 0x24),\n \t\t.port_src = 0x2928,\n \t\t.port_dst = 0x2b2a,\n \t\t.proto = 0x2c,\n \t},\n \t{\n-\t\t.ip_src = IPv4(0x33, 0x32, 0x31, 0x30),\n-\t\t.ip_dst = IPv4(0x37, 0x36, 0x35, 0x34),\n+\t\t.ip_src = RTE_IPv4(0x33, 0x32, 0x31, 0x30),\n+\t\t.ip_dst = RTE_IPv4(0x37, 0x36, 0x35, 0x34),\n \t\t.port_src = 0x3938,\n \t\t.port_dst = 0x3b3a,\n \t\t.proto = 0x3c,\n \t},\n \t{\n-\t\t.ip_src = IPv4(0x43, 0x42, 0x41, 0x40),\n-\t\t.ip_dst = IPv4(0x47, 0x46, 0x45, 0x44),\n+\t\t.ip_src = RTE_IPv4(0x43, 0x42, 0x41, 0x40),\n+\t\t.ip_dst = RTE_IPv4(0x47, 0x46, 0x45, 0x44),\n \t\t.port_src = 0x4948,\n \t\t.port_dst = 0x4b4a,\n \t\t.proto = 0x4c,\ndiff --git a/app/test/test_sched.c b/app/test/test_sched.c\nindex c6fb7871a..10d54c55a 100644\n--- a/app/test/test_sched.c\n+++ b/app/test/test_sched.c\n@@ -96,7 +96,7 @@ prepare_pkt(struct rte_sched_port *port, struct rte_mbuf *mbuf)\n \tvlan1->vlan_tci = rte_cpu_to_be_16(SUBPORT);\n \tvlan2->vlan_tci = rte_cpu_to_be_16(PIPE);\n \teth_hdr->ether_type =  rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4);\n-\tip_hdr->dst_addr = IPv4(0,0,TC,QUEUE);\n+\tip_hdr->dst_addr = RTE_IPv4(0,0,TC,QUEUE);\n \n \n \trte_sched_port_pkt_write(port, mbuf, SUBPORT, PIPE, TC, QUEUE,\ndiff --git a/app/test/test_table_acl.c b/app/test/test_table_acl.c\nindex 22136a396..e01e1f946 100644\n--- a/app/test/test_table_acl.c\n+++ b/app/test/test_table_acl.c\n@@ -7,7 +7,7 @@\n #include \"test_table.h\"\n #include \"test_table_acl.h\"\n \n-#define IPv4(a, b, c, d) ((uint32_t)(((a) & 0xff) << 24) |\t\t\\\n+#define RTE_IPv4(a, b, c, d) ((uint32_t)(((a) & 0xff) << 24) |\t\t\\\n \t(((b) & 0xff) << 16) |\t\t\t\t\t\t\\\n \t(((c) & 0xff) << 8) |\t\t\t\t\t\t\\\n \t((d) & 0xff))\n@@ -116,7 +116,7 @@ parse_ipv4_net(const char *in, uint32_t *addr, uint32_t *mask_len)\n \tGET_CB_FIELD(in, d, 0, UINT8_MAX, '/');\n \tGET_CB_FIELD(in, m, 0, sizeof(uint32_t) * CHAR_BIT, 0);\n \n-\taddr[0] = IPv4(a, b, c, d);\n+\taddr[0] = RTE_IPv4(a, b, c, d);\n \tmask_len[0] = m;\n \n \treturn 0;\n@@ -662,8 +662,8 @@ test_pipeline_single_filter(int expected_count)\n \t\t\t\tsizeof(struct ipv4_5tuple));\n \n \t\t\tfive_tuple.proto = j;\n-\t\t\tfive_tuple.ip_src = rte_bswap32(IPv4(192, 168, j, 1));\n-\t\t\tfive_tuple.ip_dst = rte_bswap32(IPv4(10, 4, j, 1));\n+\t\t\tfive_tuple.ip_src = rte_bswap32(RTE_IPv4(192, 168, j, 1));\n+\t\t\tfive_tuple.ip_dst = rte_bswap32(RTE_IPv4(10, 4, j, 1));\n \t\t\tfive_tuple.port_src = rte_bswap16(100 + j);\n \t\t\tfive_tuple.port_dst = rte_bswap16(200 + j);\n \ndiff --git a/app/test/test_thash.c b/app/test/test_thash.c\nindex bf332c9e9..3724ea5be 100644\n--- a/app/test/test_thash.c\n+++ b/app/test/test_thash.c\n@@ -59,15 +59,15 @@ struct test_thash_v6 {\n \n /*From 82599 Datasheet 7.1.2.8.3 RSS Verification Suite*/\n struct test_thash_v4 v4_tbl[] = {\n-{IPv4(161, 142, 100, 80), IPv4(66, 9, 149, 187),\n+{RTE_IPv4(161, 142, 100, 80), RTE_IPv4(66, 9, 149, 187),\n \t1766, 2794, 0x323e8fc2, 0x51ccc178},\n-{IPv4(65, 69, 140, 83), IPv4(199, 92, 111, 2),\n+{RTE_IPv4(65, 69, 140, 83), RTE_IPv4(199, 92, 111, 2),\n \t4739, 14230, 0xd718262a, 0xc626b0ea},\n-{IPv4(12, 22, 207, 184), IPv4(24, 19, 198, 95),\n+{RTE_IPv4(12, 22, 207, 184), RTE_IPv4(24, 19, 198, 95),\n \t38024, 12898, 0xd2d0a5de, 0x5c2b394a},\n-{IPv4(209, 142, 163, 6), IPv4(38, 27, 205, 30),\n+{RTE_IPv4(209, 142, 163, 6), RTE_IPv4(38, 27, 205, 30),\n \t2217, 48228, 0x82989176, 0xafc7327f},\n-{IPv4(202, 188, 127, 2), IPv4(153, 39, 163, 191),\n+{RTE_IPv4(202, 188, 127, 2), RTE_IPv4(153, 39, 163, 191),\n \t1303, 44251, 0x5d1809c5, 0x10e828a2},\n };\n \ndiff --git a/doc/guides/prog_guide/packet_classif_access_ctrl.rst b/doc/guides/prog_guide/packet_classif_access_ctrl.rst\nindex 6887e4dc6..010ec045d 100644\n--- a/doc/guides/prog_guide/packet_classif_access_ctrl.rst\n+++ b/doc/guides/prog_guide/packet_classif_access_ctrl.rst\n@@ -419,7 +419,7 @@ Classify with Multiple Categories\n             .data = {.userdata = 1, .category_mask = 3, .priority = 1},\n \n             /* destination IPv4 */\n-            .field[2] = {.value.u32 = IPv4(192,168,0,0),. mask_range.u32 = 16,},\n+            .field[2] = {.value.u32 = RTE_IPv4(192,168,0,0),. mask_range.u32 = 16,},\n \n             /* source port */\n             .field[3] = {.value.u16 = 0, .mask_range.u16 = 0xffff,},\n@@ -433,7 +433,7 @@ Classify with Multiple Categories\n             .data = {.userdata = 2, .category_mask = 1, .priority = 2},\n \n             /* destination IPv4 */\n-            .field[2] = {.value.u32 = IPv4(192,168,1,0),. mask_range.u32 = 24,},\n+            .field[2] = {.value.u32 = RTE_IPv4(192,168,1,0),. mask_range.u32 = 24,},\n \n             /* source port */\n             .field[3] = {.value.u16 = 0, .mask_range.u16 = 0xffff,},\n@@ -447,7 +447,7 @@ Classify with Multiple Categories\n             .data = {.userdata = 3, .category_mask = 2, .priority = 3},\n \n             /* source IPv4 */\n-            .field[1] = {.value.u32 = IPv4(10,1,1,1),. mask_range.u32 = 32,},\n+            .field[1] = {.value.u32 = RTE_IPv4(10,1,1,1),. mask_range.u32 = 32,},\n \n             /* source port */\n             .field[3] = {.value.u16 = 0, .mask_range.u16 = 0xffff,},\ndiff --git a/doc/guides/sample_app_ug/ip_frag.rst b/doc/guides/sample_app_ug/ip_frag.rst\nindex 2583f0c3d..49ba0d8bc 100644\n--- a/doc/guides/sample_app_ug/ip_frag.rst\n+++ b/doc/guides/sample_app_ug/ip_frag.rst\n@@ -104,14 +104,14 @@ The default l3fwd_ipv4_route_array table is:\n .. code-block:: c\n \n     struct l3fwd_ipv4_route l3fwd_ipv4_route_array[] = {\n-        {IPv4(100, 10, 0, 0), 16, 0},\n-        {IPv4(100, 20, 0, 0), 16, 1},\n-        {IPv4(100, 30, 0, 0), 16, 2},\n-        {IPv4(100, 40, 0, 0), 16, 3},\n-        {IPv4(100, 50, 0, 0), 16, 4},\n-        {IPv4(100, 60, 0, 0), 16, 5},\n-        {IPv4(100, 70, 0, 0), 16, 6},\n-        {IPv4(100, 80, 0, 0), 16, 7},\n+        {RTE_IPv4(100, 10, 0, 0), 16, 0},\n+        {RTE_IPv4(100, 20, 0, 0), 16, 1},\n+        {RTE_IPv4(100, 30, 0, 0), 16, 2},\n+        {RTE_IPv4(100, 40, 0, 0), 16, 3},\n+        {RTE_IPv4(100, 50, 0, 0), 16, 4},\n+        {RTE_IPv4(100, 60, 0, 0), 16, 5},\n+        {RTE_IPv4(100, 70, 0, 0), 16, 6},\n+        {RTE_IPv4(100, 80, 0, 0), 16, 7},\n     };\n \n The default l3fwd_ipv6_route_array table is:\ndiff --git a/doc/guides/sample_app_ug/ip_reassembly.rst b/doc/guides/sample_app_ug/ip_reassembly.rst\nindex a628b63cb..99dcd9556 100644\n--- a/doc/guides/sample_app_ug/ip_reassembly.rst\n+++ b/doc/guides/sample_app_ug/ip_reassembly.rst\n@@ -107,14 +107,14 @@ The default l3fwd_ipv4_route_array table is:\n .. code-block:: c\n \n     struct l3fwd_ipv4_route l3fwd_ipv4_route_array[] = {\n-        {IPv4(100, 10, 0, 0), 16, 0},\n-        {IPv4(100, 20, 0, 0), 16, 1},\n-        {IPv4(100, 30, 0, 0), 16, 2},\n-        {IPv4(100, 40, 0, 0), 16, 3},\n-        {IPv4(100, 50, 0, 0), 16, 4},\n-        {IPv4(100, 60, 0, 0), 16, 5},\n-        {IPv4(100, 70, 0, 0), 16, 6},\n-        {IPv4(100, 80, 0, 0), 16, 7},\n+        {RTE_IPv4(100, 10, 0, 0), 16, 0},\n+        {RTE_IPv4(100, 20, 0, 0), 16, 1},\n+        {RTE_IPv4(100, 30, 0, 0), 16, 2},\n+        {RTE_IPv4(100, 40, 0, 0), 16, 3},\n+        {RTE_IPv4(100, 50, 0, 0), 16, 4},\n+        {RTE_IPv4(100, 60, 0, 0), 16, 5},\n+        {RTE_IPv4(100, 70, 0, 0), 16, 6},\n+        {RTE_IPv4(100, 80, 0, 0), 16, 7},\n     };\n \n The default l3fwd_ipv6_route_array table is:\ndiff --git a/doc/guides/sample_app_ug/ipv4_multicast.rst b/doc/guides/sample_app_ug/ipv4_multicast.rst\nindex 46c920433..ea7902b2d 100644\n--- a/doc/guides/sample_app_ug/ipv4_multicast.rst\n+++ b/doc/guides/sample_app_ug/ipv4_multicast.rst\n@@ -155,7 +155,7 @@ if the routing table has any ports assigned to the destination address:\n \n .. code-block:: c\n \n-    if (!IS_IPV4_MCAST(dest_addr) ||\n+    if (!RTE_IS_IPV4_MCAST(dest_addr) ||\n        (hash = rte_fbk_hash_lookup(mcast_hash, dest_addr)) <= 0 ||\n        (port_mask = hash & enabled_port_mask) == 0) {\n            rte_pktmbuf_free(m);\ndiff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c\nindex 5a3f4d147..40034d003 100644\n--- a/drivers/net/bonding/rte_eth_bond_pmd.c\n+++ b/drivers/net/bonding/rte_eth_bond_pmd.c\n@@ -862,8 +862,8 @@ burst_xmit_l34_hash(struct rte_mbuf **buf, uint16_t nb_pkts,\n \t\t\tif (likely(rte_ipv4_frag_pkt_is_fragmented(ipv4_hdr)\n \t\t\t\t\t\t\t\t== 0)) {\n \t\t\t\tip_hdr_offset = (ipv4_hdr->version_ihl\n-\t\t\t\t\t& IPV4_HDR_IHL_MASK) *\n-\t\t\t\t\tIPV4_IHL_MULTIPLIER;\n+\t\t\t\t\t& RTE_IPV4_HDR_IHL_MASK) *\n+\t\t\t\t\tRTE_IPV4_IHL_MULTIPLIER;\n \n \t\t\t\tif (ipv4_hdr->next_proto_id == IPPROTO_TCP) {\n \t\t\t\t\ttcp_hdr = (struct tcp_hdr *)\ndiff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex d9f71d2eb..47a263a1f 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -2158,7 +2158,7 @@ eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t\t\t\t\t m->l2_len);\n \t\tfrag_field = rte_be_to_cpu_16(ip_hdr->fragment_offset);\n \n-\t\tif ((frag_field & IPV4_HDR_DF_FLAG) != 0) {\n+\t\tif ((frag_field & RTE_IPV4_HDR_DF_FLAG) != 0) {\n \t\t\tm->packet_type |= RTE_PTYPE_L4_NONFRAG;\n \n \t\t\t/* If IPv4 header has DF flag enabled and TSO support is\ndiff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c\nindex f7d77f3b6..0658554f8 100644\n--- a/drivers/net/i40e/i40e_flow.c\n+++ b/drivers/net/i40e/i40e_flow.c\n@@ -2606,8 +2606,8 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,\n \t\t\t\t/* Check if it is fragment. */\n \t\t\t\tfrag_off = ipv4_spec->hdr.fragment_offset;\n \t\t\t\tfrag_off = rte_be_to_cpu_16(frag_off);\n-\t\t\t\tif (frag_off & IPV4_HDR_OFFSET_MASK ||\n-\t\t\t\t    frag_off & IPV4_HDR_MF_FLAG)\n+\t\t\t\tif (frag_off & RTE_IPV4_HDR_OFFSET_MASK ||\n+\t\t\t\t    frag_off & RTE_IPV4_HDR_MF_FLAG)\n \t\t\t\t\tpctype = I40E_FILTER_PCTYPE_FRAG_IPV4;\n \n \t\t\t\t/* Get the filter info */\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c\nindex ebe197852..44b2f85d4 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx.c\n+++ b/drivers/net/ixgbe/ixgbe_rxtx.c\n@@ -4538,7 +4538,7 @@ ixgbe_get_rscctl_maxdesc(struct rte_mempool *pool)\n \n \t/* MAXDESC * SRRCTL.BSIZEPKT must not exceed 64 KB minus one */\n \tuint16_t maxdesc =\n-\t\tIPV4_MAX_PKT_LEN /\n+\t\tRTE_IPV4_MAX_PKT_LEN /\n \t\t\t(mp_priv->mbuf_data_room_size - RTE_PKTMBUF_HEADROOM);\n \n \tif (maxdesc >= 16)\ndiff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c\nindex e021ea5e0..2270ae304 100644\n--- a/drivers/net/mlx5/mlx5_flow_tcf.c\n+++ b/drivers/net/mlx5/mlx5_flow_tcf.c\n@@ -552,7 +552,7 @@ static const struct {\n \t},\n \t.ipv6.hdr = {\n \t\t.proto = 0xff,\n-\t\t.vtc_flow = RTE_BE32(0xfful << IPV6_HDR_FL_SHIFT),\n+\t\t.vtc_flow = RTE_BE32(0xfful << RTE_IPV6_HDR_FL_SHIFT),\n \t\t.hop_limits = 0xff,\n \t\t.src_addr =\n \t\t\t\"\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\"\n@@ -1426,7 +1426,7 @@ flow_tcf_validate_vxlan_encap_ipv6(const struct rte_flow_item *item,\n \t\t\t\t\t  \" vxlan encapsulation\");\n \t}\n \tmsk6 = (rte_be_to_cpu_32(mask->hdr.vtc_flow) >>\n-\t\tIPV6_HDR_TC_SHIFT) & 0xff;\n+\t\tRTE_IPV6_HDR_TC_SHIFT) & 0xff;\n \tif (msk6 && msk6 != 0xff)\n \t\treturn rte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\t  RTE_FLOW_ERROR_TYPE_ITEM_MASK, mask,\n@@ -2551,7 +2551,7 @@ flow_tcf_get_items_size(const struct rte_flow_attr *attr,\n \t\t\tif (ipv6 && ipv6->hdr.hop_limits)\n \t\t\t\tsize += SZ_NLATTR_TYPE_OF(uint8_t) * 2;\n \t\t\tif (ipv6 && (rte_be_to_cpu_32(ipv6->hdr.vtc_flow) &\n-\t\t\t\t     (0xfful << IPV6_HDR_TC_SHIFT)))\n+\t\t\t\t     (0xfful << RTE_IPV6_HDR_TC_SHIFT)))\n \t\t\t\tsize += SZ_NLATTR_TYPE_OF(uint8_t) * 2;\n \t\t\tbreak;\n \t\t}\n@@ -2639,7 +2639,7 @@ flow_tcf_vxlan_encap_size(const struct rte_flow_action *action)\n \t\t\tif (ipv6 && ipv6->hdr.hop_limits)\n \t\t\t\tsize += SZ_NLATTR_TYPE_OF(uint8_t) * 2;\n \t\t\tif (ipv6 && (rte_be_to_cpu_32(ipv6->hdr.vtc_flow) &\n-\t\t\t\t     (0xfful << IPV6_HDR_TC_SHIFT)))\n+\t\t\t\t     (0xfful << RTE_IPV6_HDR_TC_SHIFT)))\n \t\t\t\tsize += SZ_NLATTR_TYPE_OF(uint8_t) * 2;\n \t\t\tbreak;\n \t\t}\n@@ -3037,11 +3037,11 @@ flow_tcf_parse_vxlan_encap_ipv6(const struct rte_flow_item_ipv6 *spec,\n \t\t       FLOW_TCF_ENCAP_IPV6_DST;\n \tif (mask) {\n \t\tif ((rte_be_to_cpu_32(mask->hdr.vtc_flow) >>\n-\t\t    IPV6_HDR_TC_SHIFT) & 0xff) {\n+\t\t    RTE_IPV6_HDR_TC_SHIFT) & 0xff) {\n \t\t\tencap->mask |= FLOW_TCF_ENCAP_IP_TOS;\n \t\t\tencap->ip_tos = (rte_be_to_cpu_32\n \t\t\t\t\t\t(spec->hdr.vtc_flow) >>\n-\t\t\t\t\t\t IPV6_HDR_TC_SHIFT) & 0xff;\n+\t\t\t\t\t\t RTE_IPV6_HDR_TC_SHIFT) & 0xff;\n \t\t}\n \t\tif (mask->hdr.hop_limits) {\n \t\t\tencap->mask |= FLOW_TCF_ENCAP_IP_TTL;\n@@ -3590,11 +3590,11 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct mlx5_flow *dev_flow,\n \t\t\t\t\t mask.ipv6->hdr.hop_limits);\n \t\t\t}\n \t\t\tmsk6 = (rte_be_to_cpu_32(mask.ipv6->hdr.vtc_flow) >>\n-\t\t\t\tIPV6_HDR_TC_SHIFT) & 0xff;\n+\t\t\t\tRTE_IPV6_HDR_TC_SHIFT) & 0xff;\n \t\t\tif (msk6) {\n \t\t\t\ttos6 = (rte_be_to_cpu_32\n \t\t\t\t\t(spec.ipv6->hdr.vtc_flow) >>\n-\t\t\t\t\t\tIPV6_HDR_TC_SHIFT) & 0xff;\n+\t\t\t\t\t\tRTE_IPV6_HDR_TC_SHIFT) & 0xff;\n \t\t\t\tmnl_attr_put_u8\n \t\t\t\t\t(nlh, tunnel_outer ?\n \t\t\t\t\t TCA_FLOWER_KEY_ENC_IP_TOS :\ndiff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c\nindex 55aa8054f..2f4c80cb0 100644\n--- a/drivers/net/mlx5/mlx5_flow_verbs.c\n+++ b/drivers/net/mlx5/mlx5_flow_verbs.c\n@@ -480,17 +480,17 @@ flow_verbs_translate_item_ipv6(struct mlx5_flow *dev_flow,\n \t\tvtc_flow_val = rte_be_to_cpu_32(spec->hdr.vtc_flow);\n \t\tvtc_flow_mask = rte_be_to_cpu_32(mask->hdr.vtc_flow);\n \t\tipv6.val.flow_label =\n-\t\t\trte_cpu_to_be_32((vtc_flow_val & IPV6_HDR_FL_MASK) >>\n-\t\t\t\t\t IPV6_HDR_FL_SHIFT);\n-\t\tipv6.val.traffic_class = (vtc_flow_val & IPV6_HDR_TC_MASK) >>\n-\t\t\t\t\t IPV6_HDR_TC_SHIFT;\n+\t\t\trte_cpu_to_be_32((vtc_flow_val & RTE_IPV6_HDR_FL_MASK) >>\n+\t\t\t\t\t RTE_IPV6_HDR_FL_SHIFT);\n+\t\tipv6.val.traffic_class = (vtc_flow_val & RTE_IPV6_HDR_TC_MASK) >>\n+\t\t\t\t\t RTE_IPV6_HDR_TC_SHIFT;\n \t\tipv6.val.next_hdr = spec->hdr.proto;\n \t\tipv6.val.hop_limit = spec->hdr.hop_limits;\n \t\tipv6.mask.flow_label =\n-\t\t\trte_cpu_to_be_32((vtc_flow_mask & IPV6_HDR_FL_MASK) >>\n-\t\t\t\t\t IPV6_HDR_FL_SHIFT);\n-\t\tipv6.mask.traffic_class = (vtc_flow_mask & IPV6_HDR_TC_MASK) >>\n-\t\t\t\t\t  IPV6_HDR_TC_SHIFT;\n+\t\t\trte_cpu_to_be_32((vtc_flow_mask & RTE_IPV6_HDR_FL_MASK) >>\n+\t\t\t\t\t RTE_IPV6_HDR_FL_SHIFT);\n+\t\tipv6.mask.traffic_class = (vtc_flow_mask & RTE_IPV6_HDR_TC_MASK) >>\n+\t\t\t\t\t  RTE_IPV6_HDR_TC_SHIFT;\n \t\tipv6.mask.next_hdr = mask->hdr.proto;\n \t\tipv6.mask.hop_limit = mask->hdr.hop_limits;\n \t\t/* Remove unwanted bits from values. */\ndiff --git a/drivers/net/tap/tap_bpf_program.c b/drivers/net/tap/tap_bpf_program.c\nindex 2b1dba15b..531569b12 100644\n--- a/drivers/net/tap/tap_bpf_program.c\n+++ b/drivers/net/tap/tap_bpf_program.c\n@@ -19,7 +19,7 @@\n #include \"tap_rss.h\"\n \n /** Create IPv4 address */\n-#define IPv4(a, b, c, d) ((__u32)(((a) & 0xff) << 24) | \\\n+#define RTE_IPv4(a, b, c, d) ((__u32)(((a) & 0xff) << 24) | \\\n \t\t(((b) & 0xff) << 16) | \\\n \t\t(((c) & 0xff) << 8)  | \\\n \t\t((d) & 0xff))\n@@ -157,11 +157,11 @@ rss_l3_l4(struct __sk_buff *skb)\n \t\t__u8 *src_dst_addr = data + off + offsetof(struct iphdr, saddr);\n \t\t__u8 *src_dst_port = data + off + sizeof(struct iphdr);\n \t\tstruct ipv4_l3_l4_tuple v4_tuple = {\n-\t\t\t.src_addr = IPv4(*(src_dst_addr + 0),\n+\t\t\t.src_addr = RTE_IPv4(*(src_dst_addr + 0),\n \t\t\t\t\t*(src_dst_addr + 1),\n \t\t\t\t\t*(src_dst_addr + 2),\n \t\t\t\t\t*(src_dst_addr + 3)),\n-\t\t\t.dst_addr = IPv4(*(src_dst_addr + 4),\n+\t\t\t.dst_addr = RTE_IPv4(*(src_dst_addr + 4),\n \t\t\t\t\t*(src_dst_addr + 5),\n \t\t\t\t\t*(src_dst_addr + 6),\n \t\t\t\t\t*(src_dst_addr + 7)),\ndiff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c\nindex 576090239..a6a69df22 100644\n--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c\n+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c\n@@ -684,8 +684,8 @@ vmxnet3_guess_mss(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd,\n \t\t\t\t\t- sizeof(struct tcp_hdr);\n \n \t\tipv4_hdr = (struct rte_ipv4_hdr *)(ptr + hlen);\n-\t\thlen += (ipv4_hdr->version_ihl & IPV4_HDR_IHL_MASK) *\n-\t\t\t\tIPV4_IHL_MULTIPLIER;\n+\t\thlen += (ipv4_hdr->version_ihl & RTE_IPV4_HDR_IHL_MASK) *\n+\t\t\t\tRTE_IPV4_IHL_MULTIPLIER;\n \t} else if (rcd->v6) {\n \t\tif (unlikely(slen < hlen + sizeof(struct rte_ipv6_hdr)))\n \t\t\treturn hw->mtu - sizeof(struct rte_ipv6_hdr) -\ndiff --git a/examples/flow_classify/flow_classify.c b/examples/flow_classify/flow_classify.c\nindex c75a410f4..e68d0f694 100644\n--- a/examples/flow_classify/flow_classify.c\n+++ b/examples/flow_classify/flow_classify.c\n@@ -379,7 +379,7 @@ parse_ipv4_net(char *in, uint32_t *addr, uint32_t *mask_len)\n \tif (get_cb_field(&in, &m, 0, sizeof(uint32_t) * CHAR_BIT, 0))\n \t\treturn -EINVAL;\n \n-\taddr[0] = IPv4(a, b, c, d);\n+\taddr[0] = RTE_IPv4(a, b, c, d);\n \tmask_len[0] = m;\n \treturn 0;\n }\ndiff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c\nindex 847f9ab60..f8b303346 100644\n--- a/examples/ip_fragmentation/main.c\n+++ b/examples/ip_fragmentation/main.c\n@@ -169,14 +169,14 @@ struct l3fwd_ipv4_route {\n };\n \n struct l3fwd_ipv4_route l3fwd_ipv4_route_array[] = {\n-\t\t{IPv4(100,10,0,0), 16, 0},\n-\t\t{IPv4(100,20,0,0), 16, 1},\n-\t\t{IPv4(100,30,0,0), 16, 2},\n-\t\t{IPv4(100,40,0,0), 16, 3},\n-\t\t{IPv4(100,50,0,0), 16, 4},\n-\t\t{IPv4(100,60,0,0), 16, 5},\n-\t\t{IPv4(100,70,0,0), 16, 6},\n-\t\t{IPv4(100,80,0,0), 16, 7},\n+\t\t{RTE_IPv4(100,10,0,0), 16, 0},\n+\t\t{RTE_IPv4(100,20,0,0), 16, 1},\n+\t\t{RTE_IPv4(100,30,0,0), 16, 2},\n+\t\t{RTE_IPv4(100,40,0,0), 16, 3},\n+\t\t{RTE_IPv4(100,50,0,0), 16, 4},\n+\t\t{RTE_IPv4(100,60,0,0), 16, 5},\n+\t\t{RTE_IPv4(100,70,0,0), 16, 6},\n+\t\t{RTE_IPv4(100,80,0,0), 16, 7},\n };\n \n /*\ndiff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c\nindex 0d5bf0a85..8351270c0 100644\n--- a/examples/ip_reassembly/main.c\n+++ b/examples/ip_reassembly/main.c\n@@ -190,14 +190,14 @@ struct l3fwd_ipv4_route {\n };\n \n struct l3fwd_ipv4_route l3fwd_ipv4_route_array[] = {\n-\t\t{IPv4(100,10,0,0), 16, 0},\n-\t\t{IPv4(100,20,0,0), 16, 1},\n-\t\t{IPv4(100,30,0,0), 16, 2},\n-\t\t{IPv4(100,40,0,0), 16, 3},\n-\t\t{IPv4(100,50,0,0), 16, 4},\n-\t\t{IPv4(100,60,0,0), 16, 5},\n-\t\t{IPv4(100,70,0,0), 16, 6},\n-\t\t{IPv4(100,80,0,0), 16, 7},\n+\t\t{RTE_IPv4(100,10,0,0), 16, 0},\n+\t\t{RTE_IPv4(100,20,0,0), 16, 1},\n+\t\t{RTE_IPv4(100,30,0,0), 16, 2},\n+\t\t{RTE_IPv4(100,40,0,0), 16, 3},\n+\t\t{RTE_IPv4(100,50,0,0), 16, 4},\n+\t\t{RTE_IPv4(100,60,0,0), 16, 5},\n+\t\t{RTE_IPv4(100,70,0,0), 16, 6},\n+\t\t{RTE_IPv4(100,80,0,0), 16, 7},\n };\n \n /*\ndiff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c\nindex 8043ed54a..8a3d89497 100644\n--- a/examples/ipsec-secgw/sa.c\n+++ b/examples/ipsec-secgw/sa.c\n@@ -951,7 +951,7 @@ get_spi_proto(uint32_t spi, enum rte_security_ipsec_sa_direction dir)\n \t\tif (rc6 >= 0) {\n \t\t\tRTE_LOG(ERR, IPSEC,\n \t\t\t\t\"%s: SPI %u used simultaeously by \"\n-\t\t\t\t\"IPv4(%d) and IPv6 (%d) SP rules\\n\",\n+\t\t\t\t\"RTE_IPv4(%d) and IPv6 (%d) SP rules\\n\",\n \t\t\t\t__func__, spi, rc4, rc6);\n \t\t\treturn -EINVAL;\n \t\t} else\n@@ -1040,7 +1040,7 @@ ipsec_sa_init(struct ipsec_sa *lsa, struct rte_ipsec_sa *sa, uint32_t sa_size)\n \tstruct rte_ipsec_sa_prm prm;\n \tstruct rte_ipv4_hdr v4  = {\n \t\t.version_ihl = IPVERSION << 4 |\n-\t\t\tsizeof(v4) / IPV4_IHL_MULTIPLIER,\n+\t\t\tsizeof(v4) / RTE_IPV4_IHL_MULTIPLIER,\n \t\t.time_to_live = IPDEFTTL,\n \t\t.next_proto_id = IPPROTO_ESP,\n \t\t.src_addr = lsa->src.ip.ip4,\ndiff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c\nindex a84d28c86..15f2b4b27 100644\n--- a/examples/ipv4_multicast/main.c\n+++ b/examples/ipv4_multicast/main.c\n@@ -138,21 +138,21 @@ struct mcast_group_params {\n };\n \n static struct mcast_group_params mcast_group_table[] = {\n-\t\t{IPv4(224,0,0,101), 0x1},\n-\t\t{IPv4(224,0,0,102), 0x2},\n-\t\t{IPv4(224,0,0,103), 0x3},\n-\t\t{IPv4(224,0,0,104), 0x4},\n-\t\t{IPv4(224,0,0,105), 0x5},\n-\t\t{IPv4(224,0,0,106), 0x6},\n-\t\t{IPv4(224,0,0,107), 0x7},\n-\t\t{IPv4(224,0,0,108), 0x8},\n-\t\t{IPv4(224,0,0,109), 0x9},\n-\t\t{IPv4(224,0,0,110), 0xA},\n-\t\t{IPv4(224,0,0,111), 0xB},\n-\t\t{IPv4(224,0,0,112), 0xC},\n-\t\t{IPv4(224,0,0,113), 0xD},\n-\t\t{IPv4(224,0,0,114), 0xE},\n-\t\t{IPv4(224,0,0,115), 0xF},\n+\t\t{RTE_IPv4(224,0,0,101), 0x1},\n+\t\t{RTE_IPv4(224,0,0,102), 0x2},\n+\t\t{RTE_IPv4(224,0,0,103), 0x3},\n+\t\t{RTE_IPv4(224,0,0,104), 0x4},\n+\t\t{RTE_IPv4(224,0,0,105), 0x5},\n+\t\t{RTE_IPv4(224,0,0,106), 0x6},\n+\t\t{RTE_IPv4(224,0,0,107), 0x7},\n+\t\t{RTE_IPv4(224,0,0,108), 0x8},\n+\t\t{RTE_IPv4(224,0,0,109), 0x9},\n+\t\t{RTE_IPv4(224,0,0,110), 0xA},\n+\t\t{RTE_IPv4(224,0,0,111), 0xB},\n+\t\t{RTE_IPv4(224,0,0,112), 0xC},\n+\t\t{RTE_IPv4(224,0,0,113), 0xD},\n+\t\t{RTE_IPv4(224,0,0,114), 0xE},\n+\t\t{RTE_IPv4(224,0,0,115), 0xF},\n };\n \n #define N_MCAST_GROUPS \\\n@@ -317,7 +317,7 @@ mcast_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf)\n \t * Check that it is a valid multicast address and\n \t * we have some active ports assigned to it.\n \t */\n-\tif(!IS_IPV4_MCAST(dest_addr) ||\n+\tif (!RTE_IS_IPV4_MCAST(dest_addr) ||\n \t    (hash = rte_fbk_hash_lookup(mcast_hash, dest_addr)) <= 0 ||\n \t    (port_mask = hash & enabled_port_mask) == 0) {\n \t\trte_pktmbuf_free(m);\ndiff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c\nindex 06f5d1db1..afc658e5d 100644\n--- a/examples/l2fwd-crypto/main.c\n+++ b/examples/l2fwd-crypto/main.c\n@@ -404,8 +404,8 @@ l2fwd_simple_crypto_enqueue(struct rte_mbuf *m,\n \tip_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(m, char *) +\n \t\t\tipdata_offset);\n \n-\tipdata_offset += (ip_hdr->version_ihl & IPV4_HDR_IHL_MASK)\n-\t\t\t* IPV4_IHL_MULTIPLIER;\n+\tipdata_offset += (ip_hdr->version_ihl & RTE_IPV4_HDR_IHL_MASK)\n+\t\t\t* RTE_IPV4_IHL_MULTIPLIER;\n \n \n \t/* Zero pad data to be crypto'd so it is block aligned */\ndiff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c\nindex 16ab0d0fd..40ab5a52d 100644\n--- a/examples/l3fwd-acl/main.c\n+++ b/examples/l3fwd-acl/main.c\n@@ -901,7 +901,7 @@ parse_ipv4_net(const char *in, uint32_t *addr, uint32_t *mask_len)\n \tGET_CB_FIELD(in, d, 0, UINT8_MAX, '/');\n \tGET_CB_FIELD(in, m, 0, sizeof(uint32_t) * CHAR_BIT, 0);\n \n-\taddr[0] = IPv4(a, b, c, d);\n+\taddr[0] = RTE_IPv4(a, b, c, d);\n \tmask_len[0] = m;\n \n \treturn 0;\ndiff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c\nindex b1da553e9..2c6da3ffc 100644\n--- a/examples/l3fwd-power/main.c\n+++ b/examples/l3fwd-power/main.c\n@@ -258,10 +258,10 @@ struct ipv6_l3fwd_route {\n };\n \n static struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {\n-\t{{IPv4(100,10,0,1), IPv4(200,10,0,1), 101, 11, IPPROTO_TCP}, 0},\n-\t{{IPv4(100,20,0,2), IPv4(200,20,0,2), 102, 12, IPPROTO_TCP}, 1},\n-\t{{IPv4(100,30,0,3), IPv4(200,30,0,3), 103, 13, IPPROTO_TCP}, 2},\n-\t{{IPv4(100,40,0,4), IPv4(200,40,0,4), 104, 14, IPPROTO_TCP}, 3},\n+\t{{RTE_IPv4(100,10,0,1), RTE_IPv4(200,10,0,1), 101, 11, IPPROTO_TCP}, 0},\n+\t{{RTE_IPv4(100,20,0,2), RTE_IPv4(200,20,0,2), 102, 12, IPPROTO_TCP}, 1},\n+\t{{RTE_IPv4(100,30,0,3), RTE_IPv4(200,30,0,3), 103, 13, IPPROTO_TCP}, 2},\n+\t{{RTE_IPv4(100,40,0,4), RTE_IPv4(200,40,0,4), 104, 14, IPPROTO_TCP}, 3},\n };\n \n static struct ipv6_l3fwd_route ipv6_l3fwd_route_array[] = {\n@@ -300,14 +300,14 @@ struct ipv4_l3fwd_route {\n };\n \n static struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {\n-\t{IPv4(1,1,1,0), 24, 0},\n-\t{IPv4(2,1,1,0), 24, 1},\n-\t{IPv4(3,1,1,0), 24, 2},\n-\t{IPv4(4,1,1,0), 24, 3},\n-\t{IPv4(5,1,1,0), 24, 4},\n-\t{IPv4(6,1,1,0), 24, 5},\n-\t{IPv4(7,1,1,0), 24, 6},\n-\t{IPv4(8,1,1,0), 24, 7},\n+\t{RTE_IPv4(1,1,1,0), 24, 0},\n+\t{RTE_IPv4(2,1,1,0), 24, 1},\n+\t{RTE_IPv4(3,1,1,0), 24, 2},\n+\t{RTE_IPv4(4,1,1,0), 24, 3},\n+\t{RTE_IPv4(5,1,1,0), 24, 4},\n+\t{RTE_IPv4(6,1,1,0), 24, 5},\n+\t{RTE_IPv4(7,1,1,0), 24, 6},\n+\t{RTE_IPv4(8,1,1,0), 24, 7},\n };\n \n #define IPV4_L3FWD_NUM_ROUTES \\\ndiff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c\nindex ebb2378dd..5e3809b8d 100644\n--- a/examples/l3fwd-vf/main.c\n+++ b/examples/l3fwd-vf/main.c\n@@ -201,10 +201,10 @@ struct l3fwd_route {\n };\n \n static struct l3fwd_route l3fwd_route_array[] = {\n-\t{{IPv4(100,10,0,1), IPv4(200,10,0,1), 101, 11, IPPROTO_TCP}, 0},\n-\t{{IPv4(100,20,0,2), IPv4(200,20,0,2), 102, 12, IPPROTO_TCP}, 1},\n-\t{{IPv4(100,30,0,3), IPv4(200,30,0,3), 103, 13, IPPROTO_TCP}, 2},\n-\t{{IPv4(100,40,0,4), IPv4(200,40,0,4), 104, 14, IPPROTO_TCP}, 3},\n+\t{{RTE_IPv4(100,10,0,1), RTE_IPv4(200,10,0,1), 101, 11, IPPROTO_TCP}, 0},\n+\t{{RTE_IPv4(100,20,0,2), RTE_IPv4(200,20,0,2), 102, 12, IPPROTO_TCP}, 1},\n+\t{{RTE_IPv4(100,30,0,3), RTE_IPv4(200,30,0,3), 103, 13, IPPROTO_TCP}, 2},\n+\t{{RTE_IPv4(100,40,0,4), RTE_IPv4(200,40,0,4), 104, 14, IPPROTO_TCP}, 3},\n };\n \n typedef struct rte_hash lookup_struct_t;\n@@ -234,14 +234,14 @@ struct l3fwd_route {\n };\n \n static struct l3fwd_route l3fwd_route_array[] = {\n-\t{IPv4(1,1,1,0), 24, 0},\n-\t{IPv4(2,1,1,0), 24, 1},\n-\t{IPv4(3,1,1,0), 24, 2},\n-\t{IPv4(4,1,1,0), 24, 3},\n-\t{IPv4(5,1,1,0), 24, 4},\n-\t{IPv4(6,1,1,0), 24, 5},\n-\t{IPv4(7,1,1,0), 24, 6},\n-\t{IPv4(8,1,1,0), 24, 7},\n+\t{RTE_IPv4(1,1,1,0), 24, 0},\n+\t{RTE_IPv4(2,1,1,0), 24, 1},\n+\t{RTE_IPv4(3,1,1,0), 24, 2},\n+\t{RTE_IPv4(4,1,1,0), 24, 3},\n+\t{RTE_IPv4(5,1,1,0), 24, 4},\n+\t{RTE_IPv4(6,1,1,0), 24, 5},\n+\t{RTE_IPv4(7,1,1,0), 24, 6},\n+\t{RTE_IPv4(8,1,1,0), 24, 7},\n };\n \n #define L3FWD_NUM_ROUTES \\\ndiff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c\nindex 5cf5f677a..2911bbefd 100644\n--- a/examples/l3fwd/l3fwd_em.c\n+++ b/examples/l3fwd/l3fwd_em.c\n@@ -99,10 +99,10 @@ struct ipv6_l3fwd_em_route {\n };\n \n static struct ipv4_l3fwd_em_route ipv4_l3fwd_em_route_array[] = {\n-\t{{IPv4(101, 0, 0, 0), IPv4(100, 10, 0, 1),  101, 11, IPPROTO_TCP}, 0},\n-\t{{IPv4(201, 0, 0, 0), IPv4(200, 20, 0, 1),  102, 12, IPPROTO_TCP}, 1},\n-\t{{IPv4(111, 0, 0, 0), IPv4(100, 30, 0, 1),  101, 11, IPPROTO_TCP}, 2},\n-\t{{IPv4(211, 0, 0, 0), IPv4(200, 40, 0, 1),  102, 12, IPPROTO_TCP}, 3},\n+\t{{RTE_IPv4(101, 0, 0, 0), RTE_IPv4(100, 10, 0, 1),  101, 11, IPPROTO_TCP}, 0},\n+\t{{RTE_IPv4(201, 0, 0, 0), RTE_IPv4(200, 20, 0, 1),  102, 12, IPPROTO_TCP}, 1},\n+\t{{RTE_IPv4(111, 0, 0, 0), RTE_IPv4(100, 30, 0, 1),  101, 11, IPPROTO_TCP}, 2},\n+\t{{RTE_IPv4(211, 0, 0, 0), RTE_IPv4(200, 40, 0, 1),  102, 12, IPPROTO_TCP}, 3},\n };\n \n static struct ipv6_l3fwd_em_route ipv6_l3fwd_em_route_array[] = {\n@@ -426,19 +426,19 @@ populate_ipv4_many_flow_into_table(const struct rte_hash *h,\n \t\tswitch (i & (NUMBER_PORT_USED - 1)) {\n \t\tcase 0:\n \t\t\tentry = ipv4_l3fwd_em_route_array[0];\n-\t\t\tentry.key.ip_dst = IPv4(101, c, b, a);\n+\t\t\tentry.key.ip_dst = RTE_IPv4(101, c, b, a);\n \t\t\tbreak;\n \t\tcase 1:\n \t\t\tentry = ipv4_l3fwd_em_route_array[1];\n-\t\t\tentry.key.ip_dst = IPv4(201, c, b, a);\n+\t\t\tentry.key.ip_dst = RTE_IPv4(201, c, b, a);\n \t\t\tbreak;\n \t\tcase 2:\n \t\t\tentry = ipv4_l3fwd_em_route_array[2];\n-\t\t\tentry.key.ip_dst = IPv4(111, c, b, a);\n+\t\t\tentry.key.ip_dst = RTE_IPv4(111, c, b, a);\n \t\t\tbreak;\n \t\tcase 3:\n \t\t\tentry = ipv4_l3fwd_em_route_array[3];\n-\t\t\tentry.key.ip_dst = IPv4(211, c, b, a);\n+\t\t\tentry.key.ip_dst = RTE_IPv4(211, c, b, a);\n \t\t\tbreak;\n \t\t};\n \t\tconvert_ipv4_5tuple(&entry.key, &newkey);\n@@ -576,8 +576,8 @@ em_parse_ptype(struct rte_mbuf *m)\n \tl3 = (uint8_t *)eth_hdr + sizeof(struct rte_ether_hdr);\n \tif (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) {\n \t\tipv4_hdr = (struct rte_ipv4_hdr *)l3;\n-\t\thdr_len = (ipv4_hdr->version_ihl & IPV4_HDR_IHL_MASK) *\n-\t\t\t  IPV4_IHL_MULTIPLIER;\n+\t\thdr_len = (ipv4_hdr->version_ihl & RTE_IPV4_HDR_IHL_MASK) *\n+\t\t\t  RTE_IPV4_IHL_MULTIPLIER;\n \t\tif (hdr_len == sizeof(struct rte_ipv4_hdr)) {\n \t\t\tpacket_type |= RTE_PTYPE_L3_IPV4;\n \t\t\tif (ipv4_hdr->next_proto_id == IPPROTO_TCP)\ndiff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c\nindex 5fa8c5380..6bfc3be68 100644\n--- a/examples/l3fwd/l3fwd_lpm.c\n+++ b/examples/l3fwd/l3fwd_lpm.c\n@@ -43,14 +43,14 @@ struct ipv6_l3fwd_lpm_route {\n \n /* 192.18.0.0/16 are set aside for RFC2544 benchmarking. */\n static struct ipv4_l3fwd_lpm_route ipv4_l3fwd_lpm_route_array[] = {\n-\t{IPv4(192, 18, 0, 0), 24, 0},\n-\t{IPv4(192, 18, 1, 0), 24, 1},\n-\t{IPv4(192, 18, 2, 0), 24, 2},\n-\t{IPv4(192, 18, 3, 0), 24, 3},\n-\t{IPv4(192, 18, 4, 0), 24, 4},\n-\t{IPv4(192, 18, 5, 0), 24, 5},\n-\t{IPv4(192, 18, 6, 0), 24, 6},\n-\t{IPv4(192, 18, 7, 0), 24, 7},\n+\t{RTE_IPv4(192, 18, 0, 0), 24, 0},\n+\t{RTE_IPv4(192, 18, 1, 0), 24, 1},\n+\t{RTE_IPv4(192, 18, 2, 0), 24, 2},\n+\t{RTE_IPv4(192, 18, 3, 0), 24, 3},\n+\t{RTE_IPv4(192, 18, 4, 0), 24, 4},\n+\t{RTE_IPv4(192, 18, 5, 0), 24, 5},\n+\t{RTE_IPv4(192, 18, 6, 0), 24, 6},\n+\t{RTE_IPv4(192, 18, 7, 0), 24, 7},\n };\n \n /* 2001:0200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180) */\ndiff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c\nindex a909f35cd..364057997 100644\n--- a/examples/performance-thread/l3fwd-thread/main.c\n+++ b/examples/performance-thread/l3fwd-thread/main.c\n@@ -380,10 +380,10 @@ struct ipv6_l3fwd_route {\n };\n \n static struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {\n-\t{{IPv4(101, 0, 0, 0), IPv4(100, 10, 0, 1),  101, 11, IPPROTO_TCP}, 0},\n-\t{{IPv4(201, 0, 0, 0), IPv4(200, 20, 0, 1),  102, 12, IPPROTO_TCP}, 1},\n-\t{{IPv4(111, 0, 0, 0), IPv4(100, 30, 0, 1),  101, 11, IPPROTO_TCP}, 2},\n-\t{{IPv4(211, 0, 0, 0), IPv4(200, 40, 0, 1),  102, 12, IPPROTO_TCP}, 3},\n+\t{{RTE_IPv4(101, 0, 0, 0), RTE_IPv4(100, 10, 0, 1),  101, 11, IPPROTO_TCP}, 0},\n+\t{{RTE_IPv4(201, 0, 0, 0), RTE_IPv4(200, 20, 0, 1),  102, 12, IPPROTO_TCP}, 1},\n+\t{{RTE_IPv4(111, 0, 0, 0), RTE_IPv4(100, 30, 0, 1),  101, 11, IPPROTO_TCP}, 2},\n+\t{{RTE_IPv4(211, 0, 0, 0), RTE_IPv4(200, 40, 0, 1),  102, 12, IPPROTO_TCP}, 3},\n };\n \n static struct ipv6_l3fwd_route ipv6_l3fwd_route_array[] = {\n@@ -503,14 +503,14 @@ struct ipv6_l3fwd_route {\n };\n \n static struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {\n-\t{IPv4(1, 1, 1, 0), 24, 0},\n-\t{IPv4(2, 1, 1, 0), 24, 1},\n-\t{IPv4(3, 1, 1, 0), 24, 2},\n-\t{IPv4(4, 1, 1, 0), 24, 3},\n-\t{IPv4(5, 1, 1, 0), 24, 4},\n-\t{IPv4(6, 1, 1, 0), 24, 5},\n-\t{IPv4(7, 1, 1, 0), 24, 6},\n-\t{IPv4(8, 1, 1, 0), 24, 7},\n+\t{RTE_IPv4(1, 1, 1, 0), 24, 0},\n+\t{RTE_IPv4(2, 1, 1, 0), 24, 1},\n+\t{RTE_IPv4(3, 1, 1, 0), 24, 2},\n+\t{RTE_IPv4(4, 1, 1, 0), 24, 3},\n+\t{RTE_IPv4(5, 1, 1, 0), 24, 4},\n+\t{RTE_IPv4(6, 1, 1, 0), 24, 5},\n+\t{RTE_IPv4(7, 1, 1, 0), 24, 6},\n+\t{RTE_IPv4(8, 1, 1, 0), 24, 7},\n };\n \n static struct ipv6_l3fwd_route ipv6_l3fwd_route_array[] = {\n@@ -3145,19 +3145,19 @@ populate_ipv4_many_flow_into_table(const struct rte_hash *h,\n \t\tswitch (i & (NUMBER_PORT_USED - 1)) {\n \t\tcase 0:\n \t\t\tentry = ipv4_l3fwd_route_array[0];\n-\t\t\tentry.key.ip_dst = IPv4(101, c, b, a);\n+\t\t\tentry.key.ip_dst = RTE_IPv4(101, c, b, a);\n \t\t\tbreak;\n \t\tcase 1:\n \t\t\tentry = ipv4_l3fwd_route_array[1];\n-\t\t\tentry.key.ip_dst = IPv4(201, c, b, a);\n+\t\t\tentry.key.ip_dst = RTE_IPv4(201, c, b, a);\n \t\t\tbreak;\n \t\tcase 2:\n \t\t\tentry = ipv4_l3fwd_route_array[2];\n-\t\t\tentry.key.ip_dst = IPv4(111, c, b, a);\n+\t\t\tentry.key.ip_dst = RTE_IPv4(111, c, b, a);\n \t\t\tbreak;\n \t\tcase 3:\n \t\t\tentry = ipv4_l3fwd_route_array[3];\n-\t\t\tentry.key.ip_dst = IPv4(211, c, b, a);\n+\t\t\tentry.key.ip_dst = RTE_IPv4(211, c, b, a);\n \t\t\tbreak;\n \t\t};\n \t\tconvert_ipv4_5tuple(&entry.key, &newkey);\ndiff --git a/lib/librte_gro/gro_tcp4.c b/lib/librte_gro/gro_tcp4.c\nindex c37b4ef3e..20f2ea7e6 100644\n--- a/lib/librte_gro/gro_tcp4.c\n+++ b/lib/librte_gro/gro_tcp4.c\n@@ -239,7 +239,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,\n \t * whose DF bit is 1, IPv4 ID is ignored.\n \t */\n \tfrag_off = rte_be_to_cpu_16(ipv4_hdr->fragment_offset);\n-\tis_atomic = (frag_off & IPV4_HDR_DF_FLAG) == IPV4_HDR_DF_FLAG;\n+\tis_atomic = (frag_off & RTE_IPV4_HDR_DF_FLAG) == RTE_IPV4_HDR_DF_FLAG;\n \tip_id = is_atomic ? 0 : rte_be_to_cpu_16(ipv4_hdr->packet_id);\n \tsent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq);\n \ndiff --git a/lib/librte_gro/gro_vxlan_tcp4.c b/lib/librte_gro/gro_vxlan_tcp4.c\nindex 8e2a1dd5e..d1becb6f3 100644\n--- a/lib/librte_gro/gro_vxlan_tcp4.c\n+++ b/lib/librte_gro/gro_vxlan_tcp4.c\n@@ -348,11 +348,12 @@ gro_vxlan_tcp4_reassemble(struct rte_mbuf *pkt,\n \t * whose DF bit is 1, IPv4 ID is ignored.\n \t */\n \tfrag_off = rte_be_to_cpu_16(outer_ipv4_hdr->fragment_offset);\n-\touter_is_atomic = (frag_off & IPV4_HDR_DF_FLAG) == IPV4_HDR_DF_FLAG;\n+\touter_is_atomic =\n+\t\t(frag_off & RTE_IPV4_HDR_DF_FLAG) == RTE_IPV4_HDR_DF_FLAG;\n \touter_ip_id = outer_is_atomic ? 0 :\n \t\trte_be_to_cpu_16(outer_ipv4_hdr->packet_id);\n \tfrag_off = rte_be_to_cpu_16(ipv4_hdr->fragment_offset);\n-\tis_atomic = (frag_off & IPV4_HDR_DF_FLAG) == IPV4_HDR_DF_FLAG;\n+\tis_atomic = (frag_off & RTE_IPV4_HDR_DF_FLAG) == RTE_IPV4_HDR_DF_FLAG;\n \tip_id = is_atomic ? 0 : rte_be_to_cpu_16(ipv4_hdr->packet_id);\n \n \tsent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq);\ndiff --git a/lib/librte_gso/gso_common.h b/lib/librte_gso/gso_common.h\nindex 5f2adc833..13c9aeea8 100644\n--- a/lib/librte_gso/gso_common.h\n+++ b/lib/librte_gso/gso_common.h\n@@ -12,8 +12,8 @@\n #include <rte_tcp.h>\n #include <rte_udp.h>\n \n-#define IS_FRAGMENTED(frag_off) (((frag_off) & IPV4_HDR_OFFSET_MASK) != 0 \\\n-\t\t|| ((frag_off) & IPV4_HDR_MF_FLAG) == IPV4_HDR_MF_FLAG)\n+#define IS_FRAGMENTED(frag_off) (((frag_off) & RTE_IPV4_HDR_OFFSET_MASK) != 0 \\\n+\t\t|| ((frag_off) & RTE_IPV4_HDR_MF_FLAG) == RTE_IPV4_HDR_MF_FLAG)\n \n #define TCP_HDR_PSH_MASK ((uint8_t)0x08)\n #define TCP_HDR_FIN_MASK ((uint8_t)0x01)\ndiff --git a/lib/librte_ip_frag/rte_ip_frag.h b/lib/librte_ip_frag/rte_ip_frag.h\nindex 0d9bf94b8..2273f3864 100644\n--- a/lib/librte_ip_frag/rte_ip_frag.h\n+++ b/lib/librte_ip_frag/rte_ip_frag.h\n@@ -309,8 +309,8 @@ rte_ipv4_frag_pkt_is_fragmented(const struct rte_ipv4_hdr *hdr)\n \tuint16_t flag_offset, ip_flag, ip_ofs;\n \n \tflag_offset = rte_be_to_cpu_16(hdr->fragment_offset);\n-\tip_ofs = (uint16_t)(flag_offset & IPV4_HDR_OFFSET_MASK);\n-\tip_flag = (uint16_t)(flag_offset & IPV4_HDR_MF_FLAG);\n+\tip_ofs = (uint16_t)(flag_offset & RTE_IPV4_HDR_OFFSET_MASK);\n+\tip_flag = (uint16_t)(flag_offset & RTE_IPV4_HDR_MF_FLAG);\n \n \treturn ip_flag != 0 || ip_ofs  != 0;\n }\ndiff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/librte_ip_frag/rte_ipv4_fragmentation.c\nindex 4707119b5..221d74e1d 100644\n--- a/lib/librte_ip_frag/rte_ipv4_fragmentation.c\n+++ b/lib/librte_ip_frag/rte_ipv4_fragmentation.c\n@@ -12,22 +12,22 @@\n #include \"ip_frag_common.h\"\n \n /* Fragment Offset */\n-#define\tIPV4_HDR_DF_SHIFT\t\t\t14\n-#define\tIPV4_HDR_MF_SHIFT\t\t\t13\n-#define\tIPV4_HDR_FO_SHIFT\t\t\t3\n+#define\tRTE_IPV4_HDR_DF_SHIFT\t\t\t14\n+#define\tRTE_IPV4_HDR_MF_SHIFT\t\t\t13\n+#define\tRTE_IPV4_HDR_FO_SHIFT\t\t\t3\n \n-#define\tIPV4_HDR_DF_MASK\t\t\t(1 << IPV4_HDR_DF_SHIFT)\n-#define\tIPV4_HDR_MF_MASK\t\t\t(1 << IPV4_HDR_MF_SHIFT)\n+#define\tIPV4_HDR_DF_MASK\t\t\t(1 << RTE_IPV4_HDR_DF_SHIFT)\n+#define\tIPV4_HDR_MF_MASK\t\t\t(1 << RTE_IPV4_HDR_MF_SHIFT)\n \n-#define\tIPV4_HDR_FO_ALIGN\t\t\t(1 << IPV4_HDR_FO_SHIFT)\n+#define\tIPV4_HDR_FO_ALIGN\t\t\t(1 << RTE_IPV4_HDR_FO_SHIFT)\n \n static inline void __fill_ipv4hdr_frag(struct rte_ipv4_hdr *dst,\n \t\tconst struct rte_ipv4_hdr *src, uint16_t len, uint16_t fofs,\n \t\tuint16_t dofs, uint32_t mf)\n {\n \trte_memcpy(dst, src, sizeof(*dst));\n-\tfofs = (uint16_t)(fofs + (dofs >> IPV4_HDR_FO_SHIFT));\n-\tfofs = (uint16_t)(fofs | mf << IPV4_HDR_MF_SHIFT);\n+\tfofs = (uint16_t)(fofs + (dofs >> RTE_IPV4_HDR_FO_SHIFT));\n+\tfofs = (uint16_t)(fofs | mf << RTE_IPV4_HDR_MF_SHIFT);\n \tdst->fragment_offset = rte_cpu_to_be_16(fofs);\n \tdst->total_length = rte_cpu_to_be_16(len);\n \tdst->hdr_checksum = 0;\ndiff --git a/lib/librte_ip_frag/rte_ipv4_reassembly.c b/lib/librte_ip_frag/rte_ipv4_reassembly.c\nindex 97da607ed..b7b92ed28 100644\n--- a/lib/librte_ip_frag/rte_ipv4_reassembly.c\n+++ b/lib/librte_ip_frag/rte_ipv4_reassembly.c\n@@ -75,7 +75,7 @@ ipv4_frag_reassemble(struct ip_frag_pkt *fp)\n \tip_hdr->total_length = rte_cpu_to_be_16((uint16_t)(fp->total_size +\n \t\tm->l3_len));\n \tip_hdr->fragment_offset = (uint16_t)(ip_hdr->fragment_offset &\n-\t\trte_cpu_to_be_16(IPV4_HDR_DF_FLAG));\n+\t\trte_cpu_to_be_16(RTE_IPV4_HDR_DF_FLAG));\n \tip_hdr->hdr_checksum = 0;\n \n \treturn m;\n@@ -109,8 +109,8 @@ rte_ipv4_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,\n \tint32_t ip_len;\n \n \tflag_offset = rte_be_to_cpu_16(ip_hdr->fragment_offset);\n-\tip_ofs = (uint16_t)(flag_offset & IPV4_HDR_OFFSET_MASK);\n-\tip_flag = (uint16_t)(flag_offset & IPV4_HDR_MF_FLAG);\n+\tip_ofs = (uint16_t)(flag_offset & RTE_IPV4_HDR_OFFSET_MASK);\n+\tip_flag = (uint16_t)(flag_offset & RTE_IPV4_HDR_MF_FLAG);\n \n \tpsd = (unaligned_uint64_t *)&ip_hdr->src_addr;\n \t/* use first 8 bytes only */\n@@ -118,7 +118,7 @@ rte_ipv4_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,\n \tkey.id = ip_hdr->packet_id;\n \tkey.key_len = IPV4_KEYLEN;\n \n-\tip_ofs *= IPV4_HDR_OFFSET_UNITS;\n+\tip_ofs *= RTE_IPV4_HDR_OFFSET_UNITS;\n \tip_len = rte_be_to_cpu_16(ip_hdr->total_length) - mb->l3_len;\n \n \tIP_FRAG_LOG(DEBUG, \"%s:%d:\\n\"\ndiff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h\nindex a1431ee90..9b1944b0f 100644\n--- a/lib/librte_net/rte_ip.h\n+++ b/lib/librte_net/rte_ip.h\n@@ -42,52 +42,55 @@ struct rte_ipv4_hdr {\n } __attribute__((__packed__));\n \n /** Create IPv4 address */\n-#define IPv4(a,b,c,d) ((uint32_t)(((a) & 0xff) << 24) | \\\n+#define RTE_IPv4(a, b, c, d) ((uint32_t)(((a) & 0xff) << 24) | \\\n \t\t\t\t\t   (((b) & 0xff) << 16) | \\\n \t\t\t\t\t   (((c) & 0xff) << 8)  | \\\n \t\t\t\t\t   ((d) & 0xff))\n \n /** Maximal IPv4 packet length (including a header) */\n-#define IPV4_MAX_PKT_LEN        65535\n+#define RTE_IPV4_MAX_PKT_LEN        65535\n \n /** Internet header length mask for version_ihl field */\n-#define IPV4_HDR_IHL_MASK\t(0x0f)\n+#define RTE_IPV4_HDR_IHL_MASK\t(0x0f)\n /**\n  * Internet header length field multiplier (IHL field specifies overall header\n  * length in number of 4-byte words)\n  */\n-#define IPV4_IHL_MULTIPLIER\t(4)\n+#define RTE_IPV4_IHL_MULTIPLIER\t(4)\n \n /* Fragment Offset * Flags. */\n-#define\tIPV4_HDR_DF_SHIFT\t14\n-#define\tIPV4_HDR_MF_SHIFT\t13\n-#define\tIPV4_HDR_FO_SHIFT\t3\n+#define\tRTE_IPV4_HDR_DF_SHIFT\t14\n+#define\tRTE_IPV4_HDR_MF_SHIFT\t13\n+#define\tRTE_IPV4_HDR_FO_SHIFT\t3\n \n-#define\tIPV4_HDR_DF_FLAG\t(1 << IPV4_HDR_DF_SHIFT)\n-#define\tIPV4_HDR_MF_FLAG\t(1 << IPV4_HDR_MF_SHIFT)\n+#define\tRTE_IPV4_HDR_DF_FLAG\t(1 << RTE_IPV4_HDR_DF_SHIFT)\n+#define\tRTE_IPV4_HDR_MF_FLAG\t(1 << RTE_IPV4_HDR_MF_SHIFT)\n \n-#define\tIPV4_HDR_OFFSET_MASK\t((1 << IPV4_HDR_MF_SHIFT) - 1)\n+#define\tRTE_IPV4_HDR_OFFSET_MASK\t((1 << RTE_IPV4_HDR_MF_SHIFT) - 1)\n \n-#define\tIPV4_HDR_OFFSET_UNITS\t8\n+#define\tRTE_IPV4_HDR_OFFSET_UNITS\t8\n \n /*\n  * IPv4 address types\n  */\n-#define IPV4_ANY              ((uint32_t)0x00000000) /**< 0.0.0.0 */\n-#define IPV4_LOOPBACK         ((uint32_t)0x7f000001) /**< 127.0.0.1 */\n-#define IPV4_BROADCAST        ((uint32_t)0xe0000000) /**< 224.0.0.0 */\n-#define IPV4_ALLHOSTS_GROUP   ((uint32_t)0xe0000001) /**< 224.0.0.1 */\n-#define IPV4_ALLRTRS_GROUP    ((uint32_t)0xe0000002) /**< 224.0.0.2 */\n-#define IPV4_MAX_LOCAL_GROUP  ((uint32_t)0xe00000ff) /**< 224.0.0.255 */\n+#define RTE_IPV4_ANY              ((uint32_t)0x00000000) /**< 0.0.0.0 */\n+#define RTE_IPV4_LOOPBACK         ((uint32_t)0x7f000001) /**< 127.0.0.1 */\n+#define RTE_IPV4_BROADCAST        ((uint32_t)0xe0000000) /**< 224.0.0.0 */\n+#define RTE_IPV4_ALLHOSTS_GROUP   ((uint32_t)0xe0000001) /**< 224.0.0.1 */\n+#define RTE_IPV4_ALLRTRS_GROUP    ((uint32_t)0xe0000002) /**< 224.0.0.2 */\n+#define RTE_IPV4_MAX_LOCAL_GROUP  ((uint32_t)0xe00000ff) /**< 224.0.0.255 */\n \n /*\n  * IPv4 Multicast-related macros\n  */\n-#define IPV4_MIN_MCAST  IPv4(224, 0, 0, 0)          /**< Minimal IPv4-multicast address */\n-#define IPV4_MAX_MCAST  IPv4(239, 255, 255, 255)    /**< Maximum IPv4 multicast address */\n+#define RTE_IPV4_MIN_MCAST \\\n+\tRTE_IPv4(224, 0, 0, 0)          /**< Minimal IPv4-multicast address */\n+#define RTE_IPV4_MAX_MCAST \\\n+\tRTE_IPv4(239, 255, 255, 255)    /**< Maximum IPv4 multicast address */\n \n-#define IS_IPV4_MCAST(x) \\\n-\t((x) >= IPV4_MIN_MCAST && (x) <= IPV4_MAX_MCAST) /**< check if IPv4 address is multicast */\n+#define RTE_IS_IPV4_MCAST(x) \\\n+\t((x) >= RTE_IPV4_MIN_MCAST && (x) <= RTE_IPV4_MAX_MCAST)\n+\t/**< check if IPv4 address is multicast */\n \n /**\n  * @internal Calculate a sum of all words in the buffer.\n@@ -349,10 +352,10 @@ struct rte_ipv6_hdr {\n } __attribute__((__packed__));\n \n /* IPv6 vtc_flow: IPv / TC / flow_label */\n-#define IPV6_HDR_FL_SHIFT 0\n-#define IPV6_HDR_TC_SHIFT 20\n-#define IPV6_HDR_FL_MASK ((1u << IPV6_HDR_TC_SHIFT) - 1)\n-#define IPV6_HDR_TC_MASK (0xf << IPV6_HDR_TC_SHIFT)\n+#define RTE_IPV6_HDR_FL_SHIFT 0\n+#define RTE_IPV6_HDR_TC_SHIFT 20\n+#define RTE_IPV6_HDR_FL_MASK ((1u << RTE_IPV6_HDR_TC_SHIFT) - 1)\n+#define RTE_IPV6_HDR_TC_MASK (0xf << RTE_IPV6_HDR_TC_SHIFT)\n \n /**\n  * Process the pseudo-header checksum of an IPv6 header.\ndiff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c\nindex b01cacb9c..712383484 100644\n--- a/lib/librte_net/rte_net.c\n+++ b/lib/librte_net/rte_net.c\n@@ -315,7 +315,7 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m,\n \t\t\treturn pkt_type;\n \n \t\tif (ip4h->fragment_offset & rte_cpu_to_be_16(\n-\t\t\t\tIPV4_HDR_OFFSET_MASK | IPV4_HDR_MF_FLAG)) {\n+\t\t\t\tRTE_IPV4_HDR_OFFSET_MASK | RTE_IPV4_HDR_MF_FLAG)) {\n \t\t\tpkt_type |= RTE_PTYPE_L4_FRAG;\n \t\t\thdr_lens->l4_len = 0;\n \t\t\treturn pkt_type;\n@@ -446,8 +446,8 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m,\n \t\tif ((layers & RTE_PTYPE_INNER_L4_MASK) == 0)\n \t\t\treturn pkt_type;\n \t\tif (ip4h->fragment_offset &\n-\t\t\t\trte_cpu_to_be_16(IPV4_HDR_OFFSET_MASK |\n-\t\t\t\t\tIPV4_HDR_MF_FLAG)) {\n+\t\t\t\trte_cpu_to_be_16(RTE_IPV4_HDR_OFFSET_MASK |\n+\t\t\t\t\tRTE_IPV4_HDR_MF_FLAG)) {\n \t\t\tpkt_type |= RTE_PTYPE_INNER_L4_FRAG;\n \t\t\thdr_lens->inner_l4_len = 0;\n \t\t\treturn pkt_type;\ndiff --git a/lib/librte_port/rte_port_ras.c b/lib/librte_port/rte_port_ras.c\nindex 225802892..403028f8d 100644\n--- a/lib/librte_port/rte_port_ras.c\n+++ b/lib/librte_port/rte_port_ras.c\n@@ -156,8 +156,8 @@ process_ipv4(struct rte_port_ring_writer_ras *p, struct rte_mbuf *pkt)\n \n \t/* Get \"More fragments\" flag and fragment offset */\n \tuint16_t frag_field = rte_be_to_cpu_16(pkt_hdr->fragment_offset);\n-\tuint16_t frag_offset = (uint16_t)(frag_field & IPV4_HDR_OFFSET_MASK);\n-\tuint16_t frag_flag = (uint16_t)(frag_field & IPV4_HDR_MF_FLAG);\n+\tuint16_t frag_offset = (uint16_t)(frag_field & RTE_IPV4_HDR_OFFSET_MASK);\n+\tuint16_t frag_flag = (uint16_t)(frag_field & RTE_IPV4_HDR_MF_FLAG);\n \n \t/* If it is a fragmented packet, then try to reassemble */\n \tif ((frag_flag == 0) && (frag_offset == 0))\n",
    "prefixes": [
        "11/15"
    ]
}