Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/53803/?format=api
{ "id": 53803, "url": "http://patches.dpdk.org/api/patches/53803/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1559129358-2935-3-git-send-email-david.marchand@redhat.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": "<1559129358-2935-3-git-send-email-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1559129358-2935-3-git-send-email-david.marchand@redhat.com", "date": "2019-05-29T11:29:16", "name": "[3/5] replace RTE_IPv4 with uppercase RTE_IPV4", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e3b3fb9414cafe92f67134a2299508a96d33569f", "submitter": { "id": 1173, "url": "http://patches.dpdk.org/api/people/1173/?format=api", "name": "David Marchand", "email": "david.marchand@redhat.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1559129358-2935-3-git-send-email-david.marchand@redhat.com/mbox/", "series": [ { "id": 4807, "url": "http://patches.dpdk.org/api/series/4807/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4807", "date": "2019-05-29T11:29:14", "name": "[1/5] test/table: remove duplicate macro", "version": 1, "mbox": "http://patches.dpdk.org/series/4807/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/53803/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/53803/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 0806F1B995;\n\tWed, 29 May 2019 13:30:09 +0200 (CEST)", "from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby dpdk.org (Postfix) with ESMTP id 156FC1B993\n\tfor <dev@dpdk.org>; Wed, 29 May 2019 13:30:07 +0200 (CEST)", "from smtp.corp.redhat.com\n\t(int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id E366A3082E58;\n\tWed, 29 May 2019 11:29:53 +0000 (UTC)", "from dmarchan.remote.csb (ovpn-204-214.brq.redhat.com\n\t[10.40.204.214])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id D4D3D277B8;\n\tWed, 29 May 2019 11:29:44 +0000 (UTC)" ], "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com, thomas@monjalon.net, olivier.matz@6wind.com,\n\tmaxime.coquelin@redhat.com, stephen@networkplumber.org,\n\tKonstantin Ananyev <konstantin.ananyev@intel.com>,\n\tWenzhuo Lu <wenzhuo.lu@intel.com>, Jingjing Wu <jingjing.wu@intel.com>,\n\tBernard Iremonger <bernard.iremonger@intel.com>,\n\tByron Marohn <byron.marohn@intel.com>,\n\tPablo de Lara Guarch <pablo.de.lara.guarch@intel.com>,\n\tYipeng Wang <yipeng1.wang@intel.com>,\n\tSameh Gobriel <sameh.gobriel@intel.com>,\n\tBruce Richardson <bruce.richardson@intel.com>,\n\tChas Williams <chas3@att.com>,\n\tVladimir Medvedkin <vladimir.medvedkin@intel.com>,\n\tCristian Dumitrescu <cristian.dumitrescu@intel.com>,\n\tJohn McNamara <john.mcnamara@intel.com>,\n\tMarko Kovacevic <marko.kovacevic@intel.com>,\n\tOri Kam <orika@mellanox.com>, Radu Nicolau <radu.nicolau@intel.com>,\n\tAkhil Goyal <akhil.goyal@nxp.com>, \n\tTomasz Kantecki <tomasz.kantecki@intel.com>,\n\tDavid Hunt <david.hunt@intel.com>,\n\tHarry van Haaren <harry.van.haaren@intel.com>,\n\tXiaoyun Li <xiaoyun.li@intel.com>", "Date": "Wed, 29 May 2019 13:29:16 +0200", "Message-Id": "<1559129358-2935-3-git-send-email-david.marchand@redhat.com>", "In-Reply-To": "<1559129358-2935-1-git-send-email-david.marchand@redhat.com>", "References": "<1559129358-2935-1-git-send-email-david.marchand@redhat.com>", "X-Scanned-By": "MIMEDefang 2.84 on 10.5.11.23", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.46]); Wed, 29 May 2019 11:30:06 +0000 (UTC)", "Subject": "[dpdk-dev] [PATCH 3/5] replace RTE_IPv4 with uppercase RTE_IPV4", "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": "Since we change this macro, we might as well avoid triggering complaints\nfrom checkpatch because of mixed case.\n\nold=RTE_IPv4\nnew=RTE_IPV4\ngit grep -lw $old | xargs sed -i -e \"s/\\<$old\\>/$new/g\"\n\nSigned-off-by: David Marchand <david.marchand@redhat.com>\n---\n app/test-acl/main.c | 2 +-\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 | 8 +-\n app/test/test_hash.c | 20 ++--\n app/test/test_ipsec.c | 4 +-\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 | 6 +-\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 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 | 2 +-\n examples/ipv4_multicast/main.c | 30 ++---\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 | 16 +--\n examples/l3fwd/l3fwd_lpm.c | 16 +--\n examples/performance-thread/l3fwd-thread/main.c | 32 +++---\n lib/librte_net/rte_ip.h | 6 +-\n 31 files changed, 274 insertions(+), 274 deletions(-)", "diff": "diff --git a/app/test-acl/main.c b/app/test-acl/main.c\nindex eb62943..57f2394 100644\n--- a/app/test-acl/main.c\n+++ b/app/test-acl/main.c\n@@ -625,7 +625,7 @@ enum {\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] = RTE_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/flowgen.c b/app/test-pmd/flowgen.c\nindex a970a27..1e424a1 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= RTE_IPv4(10, 254, 0, 0);\n-static uint32_t cfg_ip_dst\t= RTE_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 0148b0a..4f2a431 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 = RTE_IPv4(127, 0, 0, 1),\n-\t.ipv4_dst = RTE_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 = RTE_IPv4(127, 0, 0, 1),\n-\t.ipv4_dst = RTE_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 8663ff0..9cd9e37 100644\n--- a/app/test/test_acl.c\n+++ b/app/test/test_acl.c\n@@ -515,15 +515,15 @@ struct rte_acl_ipv4vlan_rule acl_rule = {\n \tstatic struct ipv4_7tuple test_data[] = {\n \t\t{\n \t\t\t.proto = 6,\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.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 = RTE_IPv4(127, 84, 33, 1),\n-\t\t\t.ip_dst = RTE_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 b071f47..4f6e659 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 = RTE_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 = RTE_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 = 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{.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 = RTE_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 = RTE_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 = RTE_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 = RTE_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 = RTE_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 = RTE_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 = RTE_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 = RTE_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 = RTE_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 = RTE_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 = RTE_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 = RTE_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 = RTE_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 = RTE_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 = 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{.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 = 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+\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 = 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{.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 = RTE_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 = RTE_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 = RTE_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 = RTE_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 = RTE_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 = RTE_IPv4(192,168,1,50),\n-\t\t\t\t.ip_dst = RTE_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 = RTE_IPv4(1,2,100,200),\n-\t\t\t\t.ip_src = RTE_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 = RTE_IPv4(5,6,7,254),\n-\t\t\t\t.ip_src = RTE_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 = RTE_IPv4(1,10,20,30),\n-\t\t\t\t.ip_src = RTE_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 = RTE_IPv4(5,6,7,8),\n-\t\t\t\t.ip_src = RTE_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 = RTE_IPv4(2,2,3,4),\n-\t\t\t\t.ip_src = RTE_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 = RTE_IPv4(1,2,3,4),\n-\t\t\t\t.ip_src = RTE_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 = RTE_IPv4(1,2,100,200),\n-\t\t\t\t.ip_src = RTE_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 = RTE_IPv4(5,6,7,254),\n-\t\t\t\t.ip_src = RTE_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 = RTE_IPv4(1,10,20,30),\n-\t\t\t\t.ip_src = RTE_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 = RTE_IPv4(5,6,7,8),\n-\t\t\t\t.ip_src = RTE_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 = RTE_IPv4(2,2,3,4),\n-\t\t\t\t.ip_src = RTE_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 = RTE_IPv4(1,2,3,4),\n-\t\t\t\t.ip_src = RTE_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 2868712..73b3044 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 = RTE_IPv4(0x03, 0x02, 0x01, 0x00),\n-\t\t.ip_dst = RTE_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 = RTE_IPv4(0x13, 0x12, 0x11, 0x10),\n-\t\t.ip_dst = RTE_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 = RTE_IPv4(0x23, 0x22, 0x21, 0x20),\n-\t\t.ip_dst = RTE_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 = RTE_IPv4(0x33, 0x32, 0x31, 0x30),\n-\t\t.ip_dst = RTE_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 = RTE_IPv4(0x43, 0x42, 0x41, 0x40),\n-\t\t.ip_dst = RTE_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 f4d2fdc..cbbff31 100644\n--- a/app/test/test_flow_classify.c\n+++ b/app/test/test_flow_classify.c\n@@ -96,7 +96,7 @@\n */\n static struct rte_flow_item_ipv4 ipv4_udp_spec_1 = {\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+\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@@ -133,7 +133,7 @@\n */\n static struct rte_flow_item_ipv4 ipv4_tcp_spec_1 = {\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+\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@@ -151,8 +151,8 @@\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, RTE_IPv4(11, 12, 13, 14),\n-\tRTE_IPv4(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 8271ba7..0052dce 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 = RTE_IPv4(0x03, 0x02, 0x01, 0x00),\n-\t.ip_dst = RTE_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 = RTE_IPv4(0x13, 0x12, 0x11, 0x10),\n-\t.ip_dst = RTE_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 = RTE_IPv4(0x23, 0x22, 0x21, 0x20),\n-\t.ip_dst = RTE_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 = RTE_IPv4(0x33, 0x32, 0x31, 0x30),\n-\t.ip_dst = RTE_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 = RTE_IPv4(0x43, 0x42, 0x41, 0x40),\n-\t.ip_dst = RTE_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 606e319..3993ff4 100644\n--- a/app/test/test_ipsec.c\n+++ b/app/test/test_ipsec.c\n@@ -536,8 +536,8 @@ struct rte_ipv4_hdr ipv4_outer = {\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 = RTE_IPv4(192, 168, 1, 100),\n-\t.dst_addr = RTE_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 784501a..bbb4e9c 100644\n--- a/app/test/test_link_bonding_mode4.c\n+++ b/app/test/test_link_bonding_mode4.c\n@@ -729,8 +729,8 @@ struct link_bonding_unittest_params {\n \n \tuint16_t src_port = 10, dst_port = 20;\n \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+\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 rte_udp_hdr pkt_udp_hdr;\ndiff --git a/app/test/test_lpm.c b/app/test/test_lpm.c\nindex 0f24631..e969fe0 100644\n--- a/app/test/test_lpm.c\n+++ b/app/test/test_lpm.c\n@@ -165,7 +165,7 @@\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\n-\tuint32_t ip = RTE_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 @@\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\n-\tuint32_t ip = RTE_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 @@\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\n-\tuint32_t ip = RTE_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 @@\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\n-\tuint32_t ip = RTE_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 @@\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\n-\tuint32_t ip = RTE_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 @@\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\n-\tuint32_t ip1 = RTE_IPv4(127, 255, 255, 255), ip2 = RTE_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 @@\n \tint32_t status = 0;\n \n \t/* Add & lookup to hit invalid TBL24 entry */\n-\tip = RTE_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 @@\n \trte_lpm_delete_all(lpm);\n \n \t/* Add & lookup to hit valid TBL24 entry not extended */\n-\tip = RTE_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 @@\n \n \t/* Add & lookup to hit valid extended TBL24 entry with invalid TBL8\n \t * entry */\n-\tip = RTE_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 @@\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 = RTE_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 @@\n \tstatus = rte_lpm_lookup(lpm, ip, &next_hop_return);\n \tTEST_LPM_ASSERT(status == -ENOENT);\n \n-\tip = RTE_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 @@\n \n \t/* Add & lookup to hit valid extended TBL24 entry with valid TBL8\n \t * entry */\n-\tip_1 = RTE_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 = RTE_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 @@\n \tlpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);\n \tTEST_LPM_ASSERT(lpm != NULL);\n \n-\tip = RTE_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 @@\n \n \trte_lpm_delete_all(lpm);\n \n-\tip = RTE_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 @@\n \t/* Add rule that extends a TBL24 valid entry & lookup for both rules\n \t * (& delete & lookup) */\n \n-\tip = RTE_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 = RTE_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 @@\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 = RTE_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 = RTE_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 @@\n \tstatus = rte_lpm_lookup(lpm, ip, &next_hop_return);\n \tTEST_LPM_ASSERT(status == -ENOENT);\n \n-\tip = RTE_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 @@\n \t/* Add rule that updates the next hop in TBL24 & lookup\n \t * (& delete & lookup) */\n \n-\tip = RTE_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 @@\n \t/* Add rule that updates the next hop in TBL8 & lookup\n \t * (& delete & lookup) */\n \n-\tip = RTE_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 @@\n \n \t/* Delete a rule that is not present in the TBL24 & lookup */\n \n-\tip = RTE_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 @@\n \n \t/* Delete a rule that is not present in the TBL8 & lookup */\n \n-\tip = RTE_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 @@\n \tlpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);\n \tTEST_LPM_ASSERT(lpm != NULL);\n \n-\tip = RTE_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 = RTE_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 @@\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 = RTE_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 = RTE_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 @@\n \tstatus = rte_lpm_lookup(lpm, ip, &next_hop_return);\n \tTEST_LPM_ASSERT(status == -ENOENT);\n \n-\tip = RTE_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 @@\n \tlpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);\n \tTEST_LPM_ASSERT(lpm != NULL);\n \n-\tip = RTE_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 @@\n \tlpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);\n \tTEST_LPM_ASSERT(lpm != NULL);\n \n-\tip = RTE_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 @@\n \n \tdepth = 32;\n \tnext_hop_add = 100;\n-\tip = RTE_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 <= RTE_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 @@\n \n \t/* All tbl8 extensions have been used above. Try to add one more and\n \t * we get a fail */\n-\tip = RTE_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 @@\n \tconfig.max_rules = MAX_RULES;\n \tconfig.number_tbl8s = NUMBER_TBL8S;\n \tconfig.flags = 0;\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 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 @@\n \tlpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);\n \tTEST_LPM_ASSERT(lpm != NULL);\n \n-\tip = RTE_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 b546503..77eea66 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(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+\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 53287fc..748ddcc 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 = RTE_IPv4(0x03, 0x02, 0x01, 0x00),\n-\t\t.ip_dst = RTE_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 = RTE_IPv4(0x13, 0x12, 0x11, 0x10),\n-\t\t.ip_dst = RTE_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 = RTE_IPv4(0x23, 0x22, 0x21, 0x20),\n-\t\t.ip_dst = RTE_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 = RTE_IPv4(0x33, 0x32, 0x31, 0x30),\n-\t\t.ip_dst = RTE_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 = RTE_IPv4(0x43, 0x42, 0x41, 0x40),\n-\t\t.ip_dst = RTE_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 10d54c5..5873ee4 100644\n--- a/app/test/test_sched.c\n+++ b/app/test/test_sched.c\n@@ -96,7 +96,7 @@\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 = RTE_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 cb039c0..0bdf76a 100644\n--- a/app/test/test_table_acl.c\n+++ b/app/test/test_table_acl.c\n@@ -112,7 +112,7 @@ enum {\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] = RTE_IPv4(a, b, c, d);\n+\taddr[0] = RTE_IPV4(a, b, c, d);\n \tmask_len[0] = m;\n \n \treturn 0;\n@@ -658,8 +658,8 @@ enum {\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(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.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 3724ea5..5a6912c 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-{RTE_IPv4(161, 142, 100, 80), RTE_IPv4(66, 9, 149, 187),\n+{RTE_IPV4(161, 142, 100, 80), RTE_IPV4(66, 9, 149, 187),\n \t1766, 2794, 0x323e8fc2, 0x51ccc178},\n-{RTE_IPv4(65, 69, 140, 83), RTE_IPv4(199, 92, 111, 2),\n+{RTE_IPV4(65, 69, 140, 83), RTE_IPV4(199, 92, 111, 2),\n \t4739, 14230, 0xd718262a, 0xc626b0ea},\n-{RTE_IPv4(12, 22, 207, 184), RTE_IPv4(24, 19, 198, 95),\n+{RTE_IPV4(12, 22, 207, 184), RTE_IPV4(24, 19, 198, 95),\n \t38024, 12898, 0xd2d0a5de, 0x5c2b394a},\n-{RTE_IPv4(209, 142, 163, 6), RTE_IPv4(38, 27, 205, 30),\n+{RTE_IPV4(209, 142, 163, 6), RTE_IPV4(38, 27, 205, 30),\n \t2217, 48228, 0x82989176, 0xafc7327f},\n-{RTE_IPv4(202, 188, 127, 2), RTE_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 010ec04..c16b11a 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 = RTE_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 = RTE_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 = RTE_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 49ba0d8..afeaff3 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- {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+ {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 99dcd95..f34b9d0 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- {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+ {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/examples/flow_classify/flow_classify.c b/examples/flow_classify/flow_classify.c\nindex 75a66fd..bc7f43e 100644\n--- a/examples/flow_classify/flow_classify.c\n+++ b/examples/flow_classify/flow_classify.c\n@@ -379,7 +379,7 @@ static __attribute__((noreturn)) void\n \tif (get_cb_field(&in, &m, 0, sizeof(uint32_t) * CHAR_BIT, 0))\n \t\treturn -EINVAL;\n \n-\taddr[0] = RTE_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 f8b3033..4f94129 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{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+\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 8351270..6624b19 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{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+\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 8a3d894..8d47d1d 100644\n--- a/examples/ipsec-secgw/sa.c\n+++ b/examples/ipsec-secgw/sa.c\n@@ -951,7 +951,7 @@ struct sa_ctx {\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\"RTE_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\ndiff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c\nindex 15f2b4b..e4410f5 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{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+\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 \\\ndiff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c\nindex 40ab5a5..09b7c38 100644\n--- a/examples/l3fwd-acl/main.c\n+++ b/examples/l3fwd-acl/main.c\n@@ -901,7 +901,7 @@ struct acl_search_t {\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] = RTE_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 d72a01e..641d402 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{{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+\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{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+\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 0ef469c..9594867 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{{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+\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{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+\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 2911bbe..6d3c6cd 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{{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+\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 @@ struct ipv6_l3fwd_em_route {\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 = RTE_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 = RTE_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 = RTE_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 = RTE_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/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c\nindex 6bfc3be..b5ffd6a 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{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+\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 3640579..19b826e 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{{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+\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{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+\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 @@ static void convert_ipv6_5tuple(struct ipv6_5tuple *key1,\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 = RTE_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 = RTE_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 = RTE_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 = RTE_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_net/rte_ip.h b/lib/librte_net/rte_ip.h\nindex 9b1944b..ae3b7e7 100644\n--- a/lib/librte_net/rte_ip.h\n+++ b/lib/librte_net/rte_ip.h\n@@ -42,7 +42,7 @@ struct rte_ipv4_hdr {\n } __attribute__((__packed__));\n \n /** Create IPv4 address */\n-#define RTE_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@@ -84,9 +84,9 @@ struct rte_ipv4_hdr {\n * IPv4 Multicast-related macros\n */\n #define RTE_IPV4_MIN_MCAST \\\n-\tRTE_IPv4(224, 0, 0, 0) /**< Minimal IPv4-multicast address */\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+\tRTE_IPV4(239, 255, 255, 255) /**< Maximum IPv4 multicast address */\n \n #define RTE_IS_IPV4_MCAST(x) \\\n \t((x) >= RTE_IPV4_MIN_MCAST && (x) <= RTE_IPV4_MAX_MCAST)\n", "prefixes": [ "3/5" ] }