Patch Detail

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

{
    "id": 52553,
    "url": "http://patches.dpdk.org/api/patches/52553/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190410083218.17531-11-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": "<20190410083218.17531-11-olivier.matz@6wind.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20190410083218.17531-11-olivier.matz@6wind.com",
    "date": "2019-04-10T08:32:14",
    "name": "[RFC,v2,10/14] net: add rte prefix to ip structure",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "aaa7b51c1f5a2bdc0f40ce6f4cb0f1a6716c885d",
    "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/20190410083218.17531-11-olivier.matz@6wind.com/mbox/",
    "series": [
        {
            "id": 4226,
            "url": "http://patches.dpdk.org/api/series/4226/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4226",
            "date": "2019-04-10T08:32:06",
            "name": "prefix network structures",
            "version": 2,
            "mbox": "http://patches.dpdk.org/series/4226/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/52553/comments/",
    "check": "warning",
    "checks": "http://patches.dpdk.org/api/patches/52553/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 E086C69D4;\n\tWed, 10 Apr 2019 10:33:02 +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 310184F9A\n\tfor <dev@dpdk.org>; Wed, 10 Apr 2019 10:32:30 +0200 (CEST)",
            "from glumotte.dev.6wind.com. (unknown [10.16.0.195])\n\tby proxy.6wind.com (Postfix) with ESMTP id 0B6C1295E6E;\n\tWed, 10 Apr 2019 10:32:30 +0200 (CEST)"
        ],
        "From": "Olivier Matz <olivier.matz@6wind.com>",
        "To": "dev@dpdk.org",
        "Cc": "Ferruh Yigit <ferruh.yigit@intel.com>",
        "Date": "Wed, 10 Apr 2019 10:32:14 +0200",
        "Message-Id": "<20190410083218.17531-11-olivier.matz@6wind.com>",
        "X-Mailer": "git-send-email 2.11.0",
        "In-Reply-To": "<20190410083218.17531-1-olivier.matz@6wind.com>",
        "References": "<20181024081833.21432-1-olivier.matz@6wind.com>\n\t<20190410083218.17531-1-olivier.matz@6wind.com>",
        "Subject": "[dpdk-dev] [RFC v2 10/14] net: add rte prefix to ip structure",
        "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 structures:\n- rename struct ipv4_hdr as struct rte_ipv4_hdr.\n- rename struct ipv6_hdr as struct rte_ipv6_hdr.\n\nSigned-off-by: Olivier Matz <olivier.matz@6wind.com>\n---\n app/test-pipeline/pipeline_acl.c                   |  10 +-\n app/test-pipeline/pipeline_hash.c                  |   8 +-\n app/test-pmd/csumonly.c                            |  40 ++++----\n app/test-pmd/flowgen.c                             |   6 +-\n app/test-pmd/icmpecho.c                            |   8 +-\n app/test-pmd/macfwd.c                              |   2 +-\n app/test-pmd/macswap_common.h                      |   2 +-\n app/test-pmd/txonly.c                              |  16 +--\n app/test-pmd/util.c                                |  12 +--\n app/test/packet_burst_generator.c                  |  44 ++++-----\n app/test/packet_burst_generator.h                  |   6 +-\n app/test/test_flow_classify.c                      |  16 +--\n app/test/test_ipsec.c                              |   4 +-\n app/test/test_link_bonding.c                       |   8 +-\n app/test/test_link_bonding_mode4.c                 |   4 +-\n app/test/test_pmd_perf.c                           |   2 +-\n app/test/test_sched.c                              |   4 +-\n app/test/test_thash.c                              |   2 +-\n .../prog_guide/packet_classif_access_ctrl.rst      |  12 +--\n doc/guides/sample_app_ug/flow_classify.rst         |  10 +-\n doc/guides/sample_app_ug/ipv4_multicast.rst        |   2 +-\n doc/guides/sample_app_ug/l3_forward.rst            |  12 +--\n doc/guides/sample_app_ug/server_node_efd.rst       |   8 +-\n drivers/net/bonding/rte_eth_bond_pmd.c             |  16 +--\n drivers/net/dpaa/dpaa_rxtx.c                       |   8 +-\n drivers/net/e1000/em_rxtx.c                        |   2 +-\n drivers/net/ena/ena_ethdev.c                       |   4 +-\n drivers/net/enic/enic_clsf.c                       |  16 +--\n drivers/net/enic/enic_flow.c                       |  30 +++---\n drivers/net/i40e/i40e_fdir.c                       |  36 +++----\n drivers/net/mlx5/mlx5_flow.c                       |   6 +-\n drivers/net/mlx5/mlx5_flow_dv.c                    |   8 +-\n drivers/net/mlx5/mlx5_flow_tcf.c                   |  12 +--\n drivers/net/mvpp2/mrvl_flow.c                      |   2 +-\n drivers/net/qede/qede_filter.c                     |  14 +--\n drivers/net/qede/qede_rxtx.c                       |  12 +--\n drivers/net/sfc/sfc_tso.h                          |   4 +-\n drivers/net/softnic/rte_eth_softnic_pipeline.c     |  32 +++---\n drivers/net/tap/rte_eth_tap.c                      |  10 +-\n drivers/net/virtio/virtio_rxtx.c                   |   8 +-\n drivers/net/vmxnet3/vmxnet3_rxtx.c                 |  18 ++--\n examples/bond/main.c                               |   4 +-\n examples/flow_classify/flow_classify.c             |  10 +-\n examples/ip_fragmentation/main.c                   |  12 +--\n examples/ip_pipeline/pipeline.c                    |  32 +++---\n examples/ip_reassembly/main.c                      |  12 +--\n examples/ipsec-secgw/ipsec-secgw.c                 |   2 +-\n examples/ipsec-secgw/sa.c                          |   6 +-\n examples/ipv4_multicast/main.c                     |   4 +-\n examples/l2fwd-crypto/main.c                       |   4 +-\n examples/l3fwd-acl/main.c                          |  80 +++++++--------\n examples/l3fwd-power/main.c                        |  28 +++---\n examples/l3fwd-vf/main.c                           |  18 ++--\n examples/l3fwd/l3fwd.h                             |   6 +-\n examples/l3fwd/l3fwd_altivec.h                     |  10 +-\n examples/l3fwd/l3fwd_common.h                      |   4 +-\n examples/l3fwd/l3fwd_em.c                          |  14 +--\n examples/l3fwd/l3fwd_em.h                          |   8 +-\n examples/l3fwd/l3fwd_em_hlm.h                      |   8 +-\n examples/l3fwd/l3fwd_em_hlm_neon.h                 |   8 +-\n examples/l3fwd/l3fwd_em_hlm_sse.h                  |   8 +-\n examples/l3fwd/l3fwd_em_sequential.h               |   8 +-\n examples/l3fwd/l3fwd_lpm.c                         |  16 +--\n examples/l3fwd/l3fwd_lpm.h                         |   8 +-\n examples/l3fwd/l3fwd_lpm_altivec.h                 |  10 +-\n examples/l3fwd/l3fwd_lpm_neon.h                    |  10 +-\n examples/l3fwd/l3fwd_lpm_sse.h                     |  10 +-\n examples/l3fwd/l3fwd_neon.h                        |  10 +-\n examples/l3fwd/l3fwd_sse.h                         |  10 +-\n examples/load_balancer/runtime.c                   |   4 +-\n examples/performance-thread/l3fwd-thread/main.c    | 110 ++++++++++-----------\n examples/server_node_efd/node/node.c               |   4 +-\n examples/server_node_efd/server/main.c             |   4 +-\n examples/tep_termination/vxlan.c                   |  32 +++---\n examples/tep_termination/vxlan.h                   |   2 +-\n examples/tep_termination/vxlan_setup.c             |   4 +-\n examples/vhost/main.c                              |   2 +-\n lib/librte_ethdev/rte_flow.h                       |   4 +-\n lib/librte_eventdev/rte_event_eth_rx_adapter.c     |  16 +--\n lib/librte_gro/gro_tcp4.c                          |   8 +-\n lib/librte_gro/gro_tcp4.h                          |   4 +-\n lib/librte_gro/gro_vxlan_tcp4.c                    |  12 +--\n lib/librte_gso/gso_common.h                        |   4 +-\n lib/librte_gso/gso_tcp4.c                          |   8 +-\n lib/librte_gso/gso_tunnel_tcp4.c                   |  10 +-\n lib/librte_gso/gso_udp4.c                          |   8 +-\n lib/librte_gso/rte_gso.h                           |   4 +-\n lib/librte_hash/rte_thash.h                        |   2 +-\n lib/librte_ip_frag/rte_ip_frag.h                   |   8 +-\n lib/librte_ip_frag/rte_ipv4_fragmentation.c        |  26 ++---\n lib/librte_ip_frag/rte_ipv4_reassembly.c           |   6 +-\n lib/librte_ip_frag/rte_ipv6_fragmentation.c        |  26 ++---\n lib/librte_ip_frag/rte_ipv6_reassembly.c           |   6 +-\n lib/librte_ipsec/iph.h                             |   8 +-\n lib/librte_net/rte_ip.h                            |  22 ++---\n lib/librte_net/rte_net.c                           |  18 ++--\n lib/librte_net/rte_net.h                           |  10 +-\n lib/librte_pipeline/rte_table_action.c             |  50 +++++-----\n lib/librte_port/rte_port_ras.c                     |   4 +-\n lib/librte_vhost/virtio_net.c                      |  10 +-\n 100 files changed, 636 insertions(+), 636 deletions(-)",
    "diff": "diff --git a/app/test-pipeline/pipeline_acl.c b/app/test-pipeline/pipeline_acl.c\nindex 8853d4376..ad939008a 100644\n--- a/app/test-pipeline/pipeline_acl.c\n+++ b/app/test-pipeline/pipeline_acl.c\n@@ -40,7 +40,7 @@ struct rte_acl_field_def ipv4_field_formats[NUM_FIELDS_IPV4] = {\n \t\t.field_index = PROTO_FIELD_IPV4,\n \t\t.input_index = PROTO_FIELD_IPV4,\n \t\t.offset = sizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, next_proto_id),\n+\t\t\toffsetof(struct rte_ipv4_hdr, next_proto_id),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_MASK,\n@@ -48,7 +48,7 @@ struct rte_acl_field_def ipv4_field_formats[NUM_FIELDS_IPV4] = {\n \t\t.field_index = SRC_FIELD_IPV4,\n \t\t.input_index = SRC_FIELD_IPV4,\n \t\t.offset = sizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, src_addr),\n+\t\t\toffsetof(struct rte_ipv4_hdr, src_addr),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_MASK,\n@@ -56,21 +56,21 @@ struct rte_acl_field_def ipv4_field_formats[NUM_FIELDS_IPV4] = {\n \t\t.field_index = DST_FIELD_IPV4,\n \t\t.input_index = DST_FIELD_IPV4,\n \t\t.offset = sizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, dst_addr),\n+\t\t\toffsetof(struct rte_ipv4_hdr, dst_addr),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_RANGE,\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = SRCP_FIELD_IPV4,\n \t\t.input_index = SRCP_FIELD_IPV4,\n-\t\t.offset = sizeof(struct rte_ether_hdr) + sizeof(struct ipv4_hdr),\n+\t\t.offset = sizeof(struct rte_ether_hdr) + sizeof(struct rte_ipv4_hdr),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_RANGE,\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = DSTP_FIELD_IPV4,\n \t\t.input_index = SRCP_FIELD_IPV4,\n-\t\t.offset = sizeof(struct rte_ether_hdr) + sizeof(struct ipv4_hdr) +\n+\t\t.offset = sizeof(struct rte_ether_hdr) + sizeof(struct rte_ipv4_hdr) +\n \t\t\tsizeof(uint16_t),\n \t},\n };\ndiff --git a/app/test-pipeline/pipeline_hash.c b/app/test-pipeline/pipeline_hash.c\nindex 3e4a0a1bb..25fb2e0da 100644\n--- a/app/test-pipeline/pipeline_hash.c\n+++ b/app/test-pipeline/pipeline_hash.c\n@@ -426,8 +426,8 @@ app_main_loop_rx_metadata(void) {\n \t\tfor (j = 0; j < n_mbufs; j++) {\n \t\t\tstruct rte_mbuf *m;\n \t\t\tuint8_t *m_data, *key;\n-\t\t\tstruct ipv4_hdr *ip_hdr;\n-\t\t\tstruct ipv6_hdr *ipv6_hdr;\n+\t\t\tstruct rte_ipv4_hdr *ip_hdr;\n+\t\t\tstruct rte_ipv6_hdr *ipv6_hdr;\n \t\t\tuint32_t ip_dst;\n \t\t\tuint8_t *ipv6_dst;\n \t\t\tuint32_t *signature, *k32;\n@@ -440,14 +440,14 @@ app_main_loop_rx_metadata(void) {\n \t\t\t\t\tAPP_METADATA_OFFSET(32));\n \n \t\t\tif (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {\n-\t\t\t\tip_hdr = (struct ipv4_hdr *)\n+\t\t\t\tip_hdr = (struct rte_ipv4_hdr *)\n \t\t\t\t\t&m_data[sizeof(struct rte_ether_hdr)];\n \t\t\t\tip_dst = ip_hdr->dst_addr;\n \n \t\t\t\tk32 = (uint32_t *) key;\n \t\t\t\tk32[0] = ip_dst & 0xFFFFFF00;\n \t\t\t} else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {\n-\t\t\t\tipv6_hdr = (struct ipv6_hdr *)\n+\t\t\t\tipv6_hdr = (struct rte_ipv6_hdr *)\n \t\t\t\t\t&m_data[sizeof(struct rte_ether_hdr)];\n \t\t\t\tipv6_dst = ipv6_hdr->dst_addr;\n \ndiff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c\nindex 7080ff5d9..eff2b4f7c 100644\n--- a/app/test-pmd/csumonly.c\n+++ b/app/test-pmd/csumonly.c\n@@ -100,7 +100,7 @@ get_udptcp_checksum(void *l3_hdr, void *l4_hdr, uint16_t ethertype)\n \n /* Parse an IPv4 header to fill l3_len, l4_len, and l4_proto */\n static void\n-parse_ipv4(struct ipv4_hdr *ipv4_hdr, struct testpmd_offload_info *info)\n+parse_ipv4(struct rte_ipv4_hdr *ipv4_hdr, struct testpmd_offload_info *info)\n {\n \tstruct tcp_hdr *tcp_hdr;\n \n@@ -119,11 +119,11 @@ parse_ipv4(struct ipv4_hdr *ipv4_hdr, struct testpmd_offload_info *info)\n \n /* Parse an IPv6 header to fill l3_len, l4_len, and l4_proto */\n static void\n-parse_ipv6(struct ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)\n+parse_ipv6(struct rte_ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)\n {\n \tstruct tcp_hdr *tcp_hdr;\n \n-\tinfo->l3_len = sizeof(struct ipv6_hdr);\n+\tinfo->l3_len = sizeof(struct rte_ipv6_hdr);\n \tinfo->l4_proto = ipv6_hdr->proto;\n \n \t/* only fill l4_len for TCP, it's useful for TSO */\n@@ -144,8 +144,8 @@ parse_ipv6(struct ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)\n static void\n parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \n \tinfo->l2_len = sizeof(struct rte_ether_hdr);\n \tinfo->ethertype = eth_hdr->ether_type;\n@@ -159,11 +159,11 @@ parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info)\n \n \tswitch (info->ethertype) {\n \tcase _htons(RTE_ETHER_TYPE_IPv4):\n-\t\tipv4_hdr = (struct ipv4_hdr *) ((char *)eth_hdr + info->l2_len);\n+\t\tipv4_hdr = (struct rte_ipv4_hdr *) ((char *)eth_hdr + info->l2_len);\n \t\tparse_ipv4(ipv4_hdr, info);\n \t\tbreak;\n \tcase _htons(RTE_ETHER_TYPE_IPv6):\n-\t\tipv6_hdr = (struct ipv6_hdr *) ((char *)eth_hdr + info->l2_len);\n+\t\tipv6_hdr = (struct rte_ipv6_hdr *) ((char *)eth_hdr + info->l2_len);\n \t\tparse_ipv6(ipv6_hdr, info);\n \t\tbreak;\n \tdefault:\n@@ -209,8 +209,8 @@ parse_vxlan_gpe(struct udp_hdr *udp_hdr,\n \t    struct testpmd_offload_info *info)\n {\n \tstruct rte_ether_hdr *eth_hdr;\n-\tstruct ipv4_hdr *ipv4_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \tstruct rte_vxlan_gpe_hdr *vxlan_gpe_hdr;\n \tuint8_t vxlan_gpe_len = sizeof(*vxlan_gpe_hdr);\n \n@@ -229,7 +229,7 @@ parse_vxlan_gpe(struct udp_hdr *udp_hdr,\n \t\tinfo->outer_l3_len = info->l3_len;\n \t\tinfo->outer_l4_proto = info->l4_proto;\n \n-\t\tipv4_hdr = (struct ipv4_hdr *)((char *)vxlan_gpe_hdr +\n+\t\tipv4_hdr = (struct rte_ipv4_hdr *)((char *)vxlan_gpe_hdr +\n \t\t\t   vxlan_gpe_len);\n \n \t\tparse_ipv4(ipv4_hdr, info);\n@@ -243,7 +243,7 @@ parse_vxlan_gpe(struct udp_hdr *udp_hdr,\n \t\tinfo->outer_l3_len = info->l3_len;\n \t\tinfo->outer_l4_proto = info->l4_proto;\n \n-\t\tipv6_hdr = (struct ipv6_hdr *)((char *)vxlan_gpe_hdr +\n+\t\tipv6_hdr = (struct rte_ipv6_hdr *)((char *)vxlan_gpe_hdr +\n \t\t\t   vxlan_gpe_len);\n \n \t\tinfo->ethertype = _htons(RTE_ETHER_TYPE_IPv6);\n@@ -272,8 +272,8 @@ static void\n parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)\n {\n \tstruct rte_ether_hdr *eth_hdr;\n-\tstruct ipv4_hdr *ipv4_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \tuint8_t gre_len = 0;\n \n \tgre_len += sizeof(struct simple_gre_hdr);\n@@ -292,7 +292,7 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)\n \t\tinfo->outer_l3_len = info->l3_len;\n \t\tinfo->outer_l4_proto = info->l4_proto;\n \n-\t\tipv4_hdr = (struct ipv4_hdr *)((char *)gre_hdr + gre_len);\n+\t\tipv4_hdr = (struct rte_ipv4_hdr *)((char *)gre_hdr + gre_len);\n \n \t\tparse_ipv4(ipv4_hdr, info);\n \t\tinfo->ethertype = _htons(RTE_ETHER_TYPE_IPv4);\n@@ -305,7 +305,7 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)\n \t\tinfo->outer_l3_len = info->l3_len;\n \t\tinfo->outer_l4_proto = info->l4_proto;\n \n-\t\tipv6_hdr = (struct ipv6_hdr *)((char *)gre_hdr + gre_len);\n+\t\tipv6_hdr = (struct rte_ipv6_hdr *)((char *)gre_hdr + gre_len);\n \n \t\tinfo->ethertype = _htons(RTE_ETHER_TYPE_IPv6);\n \t\tparse_ipv6(ipv6_hdr, info);\n@@ -332,8 +332,8 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)\n static void\n parse_encap_ip(void *encap_ip, struct testpmd_offload_info *info)\n {\n-\tstruct ipv4_hdr *ipv4_hdr = encap_ip;\n-\tstruct ipv6_hdr *ipv6_hdr = encap_ip;\n+\tstruct rte_ipv4_hdr *ipv4_hdr = encap_ip;\n+\tstruct rte_ipv6_hdr *ipv6_hdr = encap_ip;\n \tuint8_t ip_version;\n \n \tip_version = (ipv4_hdr->version_ihl & 0xf0) >> 4;\n@@ -362,7 +362,7 @@ static uint64_t\n process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,\n \tuint64_t tx_offloads)\n {\n-\tstruct ipv4_hdr *ipv4_hdr = l3_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr = l3_hdr;\n \tstruct udp_hdr *udp_hdr;\n \tstruct tcp_hdr *tcp_hdr;\n \tstruct sctp_hdr *sctp_hdr;\n@@ -453,8 +453,8 @@ static uint64_t\n process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,\n \tuint64_t tx_offloads, int tso_enabled)\n {\n-\tstruct ipv4_hdr *ipv4_hdr = outer_l3_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr = outer_l3_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr = outer_l3_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr = outer_l3_hdr;\n \tstruct udp_hdr *udp_hdr;\n \tuint64_t ol_flags = 0;\n \ndiff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c\nindex 00acbaf70..45a5e13e0 100644\n--- a/app/test-pmd/flowgen.c\n+++ b/app/test-pmd/flowgen.c\n@@ -120,7 +120,7 @@ pkt_burst_flow_gen(struct fwd_stream *fs)\n \tstruct rte_mempool *mbp;\n \tstruct rte_mbuf  *pkt;\n \tstruct rte_ether_hdr *eth_hdr;\n-\tstruct ipv4_hdr *ip_hdr;\n+\tstruct rte_ipv4_hdr *ip_hdr;\n \tstruct udp_hdr *udp_hdr;\n \tuint16_t vlan_tci, vlan_tci_outer;\n \tuint64_t ol_flags = 0;\n@@ -176,7 +176,7 @@ pkt_burst_flow_gen(struct fwd_stream *fs)\n \t\teth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4);\n \n \t\t/* Initialize IP header. */\n-\t\tip_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\t\tip_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \t\tmemset(ip_hdr, 0, sizeof(*ip_hdr));\n \t\tip_hdr->version_ihl\t= IP_VHL_DEF;\n \t\tip_hdr->type_of_service\t= 0;\n@@ -206,7 +206,7 @@ pkt_burst_flow_gen(struct fwd_stream *fs)\n \t\tpkt->vlan_tci\t\t= vlan_tci;\n \t\tpkt->vlan_tci_outer\t= vlan_tci_outer;\n \t\tpkt->l2_len\t\t= sizeof(struct rte_ether_hdr);\n-\t\tpkt->l3_len\t\t= sizeof(struct ipv4_hdr);\n+\t\tpkt->l3_len\t\t= sizeof(struct rte_ipv4_hdr);\n \t\tpkts_burst[nb_pkt]\t= pkt;\n \n \t\tnext_flow = (next_flow + 1) % cfg_n_flows;\ndiff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c\nindex 4bf3fed64..146293175 100644\n--- a/app/test-pmd/icmpecho.c\n+++ b/app/test-pmd/icmpecho.c\n@@ -243,7 +243,7 @@ ipv4_addr_dump(const char *what, uint32_t be_ipv4_addr)\n }\n \n static uint16_t\n-ipv4_hdr_cksum(struct ipv4_hdr *ip_h)\n+ipv4_hdr_cksum(struct rte_ipv4_hdr *ip_h)\n {\n \tuint16_t *v16_h;\n \tuint32_t ip_cksum;\n@@ -278,7 +278,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)\n \tstruct rte_ether_hdr *eth_h;\n \tstruct rte_vlan_hdr *vlan_h;\n \tstruct rte_arp_hdr  *arp_h;\n-\tstruct ipv4_hdr *ip_h;\n+\tstruct rte_ipv4_hdr *ip_h;\n \tstruct rte_icmp_hdr *icmp_h;\n \tstruct rte_ether_addr eth_addr;\n \tuint32_t retry;\n@@ -413,7 +413,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)\n \t\t\trte_pktmbuf_free(pkt);\n \t\t\tcontinue;\n \t\t}\n-\t\tip_h = (struct ipv4_hdr *) ((char *)eth_h + l2_len);\n+\t\tip_h = (struct rte_ipv4_hdr *) ((char *)eth_h + l2_len);\n \t\tif (verbose_level > 0) {\n \t\t\tipv4_addr_dump(\"  IPV4: src=\", ip_h->src_addr);\n \t\t\tipv4_addr_dump(\" dst=\", ip_h->dst_addr);\n@@ -426,7 +426,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)\n \t\t * Check if packet is a ICMP echo request.\n \t\t */\n \t\ticmp_h = (struct rte_icmp_hdr *) ((char *)ip_h +\n-\t\t\t\t\t      sizeof(struct ipv4_hdr));\n+\t\t\t\t\t      sizeof(struct rte_ipv4_hdr));\n \t\tif (! ((ip_h->next_proto_id == IPPROTO_ICMP) &&\n \t\t       (icmp_h->icmp_type == RTE_IP_ICMP_ECHO_REQUEST) &&\n \t\t       (icmp_h->icmp_code == 0))) {\ndiff --git a/app/test-pmd/macfwd.c b/app/test-pmd/macfwd.c\nindex f15149252..d2ebb1105 100644\n--- a/app/test-pmd/macfwd.c\n+++ b/app/test-pmd/macfwd.c\n@@ -99,7 +99,7 @@ pkt_burst_mac_forward(struct fwd_stream *fs)\n \t\tmb->ol_flags &= IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF;\n \t\tmb->ol_flags |= ol_flags;\n \t\tmb->l2_len = sizeof(struct rte_ether_hdr);\n-\t\tmb->l3_len = sizeof(struct ipv4_hdr);\n+\t\tmb->l3_len = sizeof(struct rte_ipv4_hdr);\n \t\tmb->vlan_tci = txp->tx_vlan_id;\n \t\tmb->vlan_tci_outer = txp->tx_vlan_id_outer;\n \t}\ndiff --git a/app/test-pmd/macswap_common.h b/app/test-pmd/macswap_common.h\nindex 56f86baad..7e9a3590a 100644\n--- a/app/test-pmd/macswap_common.h\n+++ b/app/test-pmd/macswap_common.h\n@@ -40,7 +40,7 @@ mbuf_field_set(struct rte_mbuf *mb, uint64_t ol_flags)\n \tmb->ol_flags &= IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF;\n \tmb->ol_flags |= ol_flags;\n \tmb->l2_len = sizeof(struct rte_ether_hdr);\n-\tmb->l3_len = sizeof(struct ipv4_hdr);\n+\tmb->l3_len = sizeof(struct rte_ipv4_hdr);\n }\n \n #endif /* _MACSWAP_COMMON_H_ */\ndiff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c\nindex d5a46e8fc..f7f023ff6 100644\n--- a/app/test-pmd/txonly.c\n+++ b/app/test-pmd/txonly.c\n@@ -51,7 +51,7 @@\n #define IP_HDRLEN  0x05 /* default IP header length == five 32-bits words. */\n #define IP_VHL_DEF (IP_VERSION | IP_HDRLEN)\n \n-static struct ipv4_hdr  pkt_ip_hdr;  /**< IP header of transmitted packets. */\n+static struct rte_ipv4_hdr  pkt_ip_hdr;  /**< IP header of transmitted packets. */\n RTE_DEFINE_PER_LCORE(uint8_t, _ip_var); /**< IP address variation */\n static struct udp_hdr pkt_udp_hdr; /**< UDP header of transmitted packets. */\n \n@@ -93,7 +93,7 @@ copy_buf_to_pkt(void* buf, unsigned len, struct rte_mbuf *pkt, unsigned offset)\n }\n \n static void\n-setup_pkt_udp_ip_headers(struct ipv4_hdr *ip_hdr,\n+setup_pkt_udp_ip_headers(struct rte_ipv4_hdr *ip_hdr,\n \t\t\t struct udp_hdr *udp_hdr,\n \t\t\t uint16_t pkt_data_len)\n {\n@@ -113,7 +113,7 @@ setup_pkt_udp_ip_headers(struct ipv4_hdr *ip_hdr,\n \t/*\n \t * Initialize IP header.\n \t */\n-\tpkt_len = (uint16_t) (pkt_len + sizeof(struct ipv4_hdr));\n+\tpkt_len = (uint16_t) (pkt_len + sizeof(struct rte_ipv4_hdr));\n \tip_hdr->version_ihl   = IP_VHL_DEF;\n \tip_hdr->type_of_service   = 0;\n \tip_hdr->fragment_offset = 0;\n@@ -175,7 +175,7 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,\n \tpkt->vlan_tci = vlan_tci;\n \tpkt->vlan_tci_outer = vlan_tci_outer;\n \tpkt->l2_len = sizeof(struct rte_ether_hdr);\n-\tpkt->l3_len = sizeof(struct ipv4_hdr);\n+\tpkt->l3_len = sizeof(struct rte_ipv4_hdr);\n \n \tpkt_len = pkt->data_len;\n \tpkt_seg = pkt;\n@@ -193,11 +193,11 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,\n \tcopy_buf_to_pkt(&pkt_ip_hdr, sizeof(pkt_ip_hdr), pkt,\n \t\t\tsizeof(struct rte_ether_hdr));\n \tif (txonly_multi_flow) {\n-\t\tstruct ipv4_hdr *ip_hdr;\n+\t\tstruct rte_ipv4_hdr *ip_hdr;\n \t\tuint32_t addr;\n \n \t\tip_hdr = rte_pktmbuf_mtod_offset(pkt,\n-\t\t\t\tstruct ipv4_hdr *,\n+\t\t\t\tstruct rte_ipv4_hdr *,\n \t\t\t\tsizeof(struct rte_ether_hdr));\n \t\t/*\n \t\t * Generate multiple flows by varying IP src addr. This\n@@ -211,7 +211,7 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,\n \t}\n \tcopy_buf_to_pkt(&pkt_udp_hdr, sizeof(pkt_udp_hdr), pkt,\n \t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\tsizeof(struct ipv4_hdr));\n+\t\t\tsizeof(struct rte_ipv4_hdr));\n \t/*\n \t * Complete first mbuf of packet and append it to the\n \t * burst of packets to be transmitted.\n@@ -346,7 +346,7 @@ tx_only_begin(__attribute__((unused)) portid_t pi)\n \tuint16_t pkt_data_len;\n \n \tpkt_data_len = (uint16_t) (tx_pkt_length - (sizeof(struct rte_ether_hdr) +\n-\t\t\t\t\t\t    sizeof(struct ipv4_hdr) +\n+\t\t\t\t\t\t    sizeof(struct rte_ipv4_hdr) +\n \t\t\t\t\t\t    sizeof(struct udp_hdr)));\n \tsetup_pkt_udp_ip_headers(&pkt_ip_hdr, &pkt_udp_hdr, pkt_data_len);\n }\ndiff --git a/app/test-pmd/util.c b/app/test-pmd/util.c\nindex 105c56090..b8e5548ca 100644\n--- a/app/test-pmd/util.c\n+++ b/app/test-pmd/util.c\n@@ -103,8 +103,8 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],\n \t\tif (sw_packet_type & RTE_PTYPE_INNER_L4_MASK)\n \t\t\tprintf(\" - inner_l4_len=%d\", hdr_lens.inner_l4_len);\n \t\tif (is_encapsulation) {\n-\t\t\tstruct ipv4_hdr *ipv4_hdr;\n-\t\t\tstruct ipv6_hdr *ipv6_hdr;\n+\t\t\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\t\t\tstruct rte_ipv6_hdr *ipv6_hdr;\n \t\t\tstruct udp_hdr *udp_hdr;\n \t\t\tuint8_t l2_len;\n \t\t\tuint8_t l3_len;\n@@ -116,15 +116,15 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],\n \n \t\t\t/* Do not support ipv4 option field */\n \t\t\tif (RTE_ETH_IS_IPV4_HDR(packet_type)) {\n-\t\t\t\tl3_len = sizeof(struct ipv4_hdr);\n+\t\t\t\tl3_len = sizeof(struct rte_ipv4_hdr);\n \t\t\t\tipv4_hdr = rte_pktmbuf_mtod_offset(mb,\n-\t\t\t\tstruct ipv4_hdr *,\n+\t\t\t\tstruct rte_ipv4_hdr *,\n \t\t\t\tl2_len);\n \t\t\t\tl4_proto = ipv4_hdr->next_proto_id;\n \t\t\t} else {\n-\t\t\t\tl3_len = sizeof(struct ipv6_hdr);\n+\t\t\t\tl3_len = sizeof(struct rte_ipv6_hdr);\n \t\t\t\tipv6_hdr = rte_pktmbuf_mtod_offset(mb,\n-\t\t\t\tstruct ipv6_hdr *,\n+\t\t\t\tstruct rte_ipv6_hdr *,\n \t\t\t\tl2_len);\n \t\t\t\tl4_proto = ipv6_hdr->proto;\n \t\t\t}\ndiff --git a/app/test/packet_burst_generator.c b/app/test/packet_burst_generator.c\nindex feee9e121..886b5f8ac 100644\n--- a/app/test/packet_burst_generator.c\n+++ b/app/test/packet_burst_generator.c\n@@ -137,7 +137,7 @@ initialize_sctp_header(struct sctp_hdr *sctp_hdr, uint16_t src_port,\n }\n \n uint16_t\n-initialize_ipv6_header(struct ipv6_hdr *ip_hdr, uint8_t *src_addr,\n+initialize_ipv6_header(struct rte_ipv6_hdr *ip_hdr, uint8_t *src_addr,\n \t\tuint8_t *dst_addr, uint16_t pkt_data_len)\n {\n \tip_hdr->vtc_flow = 0;\n@@ -148,11 +148,11 @@ initialize_ipv6_header(struct ipv6_hdr *ip_hdr, uint8_t *src_addr,\n \trte_memcpy(ip_hdr->src_addr, src_addr, sizeof(ip_hdr->src_addr));\n \trte_memcpy(ip_hdr->dst_addr, dst_addr, sizeof(ip_hdr->dst_addr));\n \n-\treturn (uint16_t) (pkt_data_len + sizeof(struct ipv6_hdr));\n+\treturn (uint16_t) (pkt_data_len + sizeof(struct rte_ipv6_hdr));\n }\n \n uint16_t\n-initialize_ipv4_header(struct ipv4_hdr *ip_hdr, uint32_t src_addr,\n+initialize_ipv4_header(struct rte_ipv4_hdr *ip_hdr, uint32_t src_addr,\n \t\tuint32_t dst_addr, uint16_t pkt_data_len)\n {\n \tuint16_t pkt_len;\n@@ -162,7 +162,7 @@ initialize_ipv4_header(struct ipv4_hdr *ip_hdr, uint32_t src_addr,\n \t/*\n \t * Initialize IP header.\n \t */\n-\tpkt_len = (uint16_t) (pkt_data_len + sizeof(struct ipv4_hdr));\n+\tpkt_len = (uint16_t) (pkt_data_len + sizeof(struct rte_ipv4_hdr));\n \n \tip_hdr->version_ihl   = IP_VHL_DEF;\n \tip_hdr->type_of_service   = 0;\n@@ -200,7 +200,7 @@ initialize_ipv4_header(struct ipv4_hdr *ip_hdr, uint32_t src_addr,\n }\n \n uint16_t\n-initialize_ipv4_header_proto(struct ipv4_hdr *ip_hdr, uint32_t src_addr,\n+initialize_ipv4_header_proto(struct rte_ipv4_hdr *ip_hdr, uint32_t src_addr,\n \t\tuint32_t dst_addr, uint16_t pkt_data_len, uint8_t proto)\n {\n \tuint16_t pkt_len;\n@@ -210,7 +210,7 @@ initialize_ipv4_header_proto(struct ipv4_hdr *ip_hdr, uint32_t src_addr,\n \t/*\n \t * Initialize IP header.\n \t */\n-\tpkt_len = (uint16_t) (pkt_data_len + sizeof(struct ipv4_hdr));\n+\tpkt_len = (uint16_t) (pkt_data_len + sizeof(struct rte_ipv4_hdr));\n \n \tip_hdr->version_ihl   = IP_VHL_DEF;\n \tip_hdr->type_of_service   = 0;\n@@ -300,13 +300,13 @@ generate_packet_burst(struct rte_mempool *mp, struct rte_mbuf **pkts_burst,\n \t\tcopy_buf_to_pkt(eth_hdr, eth_hdr_size, pkt, 0);\n \n \t\tif (ipv4) {\n-\t\t\tcopy_buf_to_pkt(ip_hdr, sizeof(struct ipv4_hdr), pkt, eth_hdr_size);\n+\t\t\tcopy_buf_to_pkt(ip_hdr, sizeof(struct rte_ipv4_hdr), pkt, eth_hdr_size);\n \t\t\tcopy_buf_to_pkt(udp_hdr, sizeof(*udp_hdr), pkt, eth_hdr_size +\n-\t\t\t\t\tsizeof(struct ipv4_hdr));\n+\t\t\t\t\tsizeof(struct rte_ipv4_hdr));\n \t\t} else {\n-\t\t\tcopy_buf_to_pkt(ip_hdr, sizeof(struct ipv6_hdr), pkt, eth_hdr_size);\n+\t\t\tcopy_buf_to_pkt(ip_hdr, sizeof(struct rte_ipv6_hdr), pkt, eth_hdr_size);\n \t\t\tcopy_buf_to_pkt(udp_hdr, sizeof(*udp_hdr), pkt, eth_hdr_size +\n-\t\t\t\t\tsizeof(struct ipv6_hdr));\n+\t\t\t\t\tsizeof(struct rte_ipv6_hdr));\n \t\t}\n \n \t\t/*\n@@ -319,10 +319,10 @@ generate_packet_burst(struct rte_mempool *mp, struct rte_mbuf **pkts_burst,\n \n \t\tif (ipv4) {\n \t\t\tpkt->vlan_tci  = RTE_ETHER_TYPE_IPv4;\n-\t\t\tpkt->l3_len = sizeof(struct ipv4_hdr);\n+\t\t\tpkt->l3_len = sizeof(struct rte_ipv4_hdr);\n \t\t} else {\n \t\t\tpkt->vlan_tci  = RTE_ETHER_TYPE_IPv6;\n-\t\t\tpkt->l3_len = sizeof(struct ipv6_hdr);\n+\t\t\tpkt->l3_len = sizeof(struct rte_ipv6_hdr);\n \t\t}\n \n \t\tpkts_burst[nb_pkt] = pkt;\n@@ -379,45 +379,45 @@ generate_packet_burst_proto(struct rte_mempool *mp,\n \t\tcopy_buf_to_pkt(eth_hdr, eth_hdr_size, pkt, 0);\n \n \t\tif (ipv4) {\n-\t\t\tcopy_buf_to_pkt(ip_hdr, sizeof(struct ipv4_hdr), pkt,\n+\t\t\tcopy_buf_to_pkt(ip_hdr, sizeof(struct rte_ipv4_hdr), pkt,\n \t\t\t\teth_hdr_size);\n \t\t\tswitch (proto) {\n \t\t\tcase IPPROTO_UDP:\n \t\t\t\tcopy_buf_to_pkt(proto_hdr,\n \t\t\t\t\tsizeof(struct udp_hdr), pkt,\n-\t\t\t\t\teth_hdr_size + sizeof(struct ipv4_hdr));\n+\t\t\t\t\teth_hdr_size + sizeof(struct rte_ipv4_hdr));\n \t\t\t\tbreak;\n \t\t\tcase IPPROTO_TCP:\n \t\t\t\tcopy_buf_to_pkt(proto_hdr,\n \t\t\t\t\tsizeof(struct tcp_hdr), pkt,\n-\t\t\t\t\teth_hdr_size + sizeof(struct ipv4_hdr));\n+\t\t\t\t\teth_hdr_size + sizeof(struct rte_ipv4_hdr));\n \t\t\t\tbreak;\n \t\t\tcase IPPROTO_SCTP:\n \t\t\t\tcopy_buf_to_pkt(proto_hdr,\n \t\t\t\t\tsizeof(struct sctp_hdr), pkt,\n-\t\t\t\t\teth_hdr_size + sizeof(struct ipv4_hdr));\n+\t\t\t\t\teth_hdr_size + sizeof(struct rte_ipv4_hdr));\n \t\t\t\tbreak;\n \t\t\tdefault:\n \t\t\t\tbreak;\n \t\t\t}\n \t\t} else {\n-\t\t\tcopy_buf_to_pkt(ip_hdr, sizeof(struct ipv6_hdr), pkt,\n+\t\t\tcopy_buf_to_pkt(ip_hdr, sizeof(struct rte_ipv6_hdr), pkt,\n \t\t\t\teth_hdr_size);\n \t\t\tswitch (proto) {\n \t\t\tcase IPPROTO_UDP:\n \t\t\t\tcopy_buf_to_pkt(proto_hdr,\n \t\t\t\t\tsizeof(struct udp_hdr), pkt,\n-\t\t\t\t\teth_hdr_size + sizeof(struct ipv6_hdr));\n+\t\t\t\t\teth_hdr_size + sizeof(struct rte_ipv6_hdr));\n \t\t\t\tbreak;\n \t\t\tcase IPPROTO_TCP:\n \t\t\t\tcopy_buf_to_pkt(proto_hdr,\n \t\t\t\t\tsizeof(struct tcp_hdr), pkt,\n-\t\t\t\t\teth_hdr_size + sizeof(struct ipv6_hdr));\n+\t\t\t\t\teth_hdr_size + sizeof(struct rte_ipv6_hdr));\n \t\t\t\tbreak;\n \t\t\tcase IPPROTO_SCTP:\n \t\t\t\tcopy_buf_to_pkt(proto_hdr,\n \t\t\t\t\tsizeof(struct sctp_hdr), pkt,\n-\t\t\t\t\teth_hdr_size + sizeof(struct ipv6_hdr));\n+\t\t\t\t\teth_hdr_size + sizeof(struct rte_ipv6_hdr));\n \t\t\t\tbreak;\n \t\t\tdefault:\n \t\t\t\tbreak;\n@@ -434,10 +434,10 @@ generate_packet_burst_proto(struct rte_mempool *mp,\n \n \t\tif (ipv4) {\n \t\t\tpkt->vlan_tci  = RTE_ETHER_TYPE_IPv4;\n-\t\t\tpkt->l3_len = sizeof(struct ipv4_hdr);\n+\t\t\tpkt->l3_len = sizeof(struct rte_ipv4_hdr);\n \t\t} else {\n \t\t\tpkt->vlan_tci  = RTE_ETHER_TYPE_IPv6;\n-\t\t\tpkt->l3_len = sizeof(struct ipv6_hdr);\n+\t\t\tpkt->l3_len = sizeof(struct rte_ipv6_hdr);\n \t\t}\n \n \t\tpkts_burst[nb_pkt] = pkt;\ndiff --git a/app/test/packet_burst_generator.h b/app/test/packet_burst_generator.h\nindex 8489212d0..93efee1f5 100644\n--- a/app/test/packet_burst_generator.h\n+++ b/app/test/packet_burst_generator.h\n@@ -46,15 +46,15 @@ initialize_sctp_header(struct sctp_hdr *sctp_hdr, uint16_t src_port,\n \t\tuint16_t dst_port, uint16_t pkt_data_len);\n \n uint16_t\n-initialize_ipv6_header(struct ipv6_hdr *ip_hdr, uint8_t *src_addr,\n+initialize_ipv6_header(struct rte_ipv6_hdr *ip_hdr, uint8_t *src_addr,\n \t\tuint8_t *dst_addr, uint16_t pkt_data_len);\n \n uint16_t\n-initialize_ipv4_header(struct ipv4_hdr *ip_hdr, uint32_t src_addr,\n+initialize_ipv4_header(struct rte_ipv4_hdr *ip_hdr, uint32_t src_addr,\n \t\tuint32_t dst_addr, uint16_t pkt_data_len);\n \n uint16_t\n-initialize_ipv4_header_proto(struct ipv4_hdr *ip_hdr, uint32_t src_addr,\n+initialize_ipv4_header_proto(struct rte_ipv4_hdr *ip_hdr, uint32_t src_addr,\n \t\tuint32_t dst_addr, uint16_t pkt_data_len, uint8_t proto);\n \n int\ndiff --git a/app/test/test_flow_classify.c b/app/test/test_flow_classify.c\nindex 3f06f3005..96e371691 100644\n--- a/app/test/test_flow_classify.c\n+++ b/app/test/test_flow_classify.c\n@@ -40,7 +40,7 @@ static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {\n \t\t.field_index = PROTO_FIELD_IPV4,\n \t\t.input_index = PROTO_INPUT_IPV4,\n \t\t.offset = sizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, next_proto_id),\n+\t\t\toffsetof(struct rte_ipv4_hdr, next_proto_id),\n \t},\n \t/* next input field (IPv4 source address) - 4 consecutive bytes. */\n \t{\n@@ -50,7 +50,7 @@ static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {\n \t\t.field_index = SRC_FIELD_IPV4,\n \t\t.input_index = SRC_INPUT_IPV4,\n \t\t.offset = sizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, src_addr),\n+\t\t\toffsetof(struct rte_ipv4_hdr, src_addr),\n \t},\n \t/* next input field (IPv4 destination address) - 4 consecutive bytes. */\n \t{\n@@ -60,7 +60,7 @@ static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {\n \t\t.field_index = DST_FIELD_IPV4,\n \t\t.input_index = DST_INPUT_IPV4,\n \t\t.offset = sizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, dst_addr),\n+\t\t\toffsetof(struct rte_ipv4_hdr, dst_addr),\n \t},\n \t/*\n \t * Next 2 fields (src & dst ports) form 4 consecutive bytes.\n@@ -73,7 +73,7 @@ static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {\n \t\t.field_index = SRCP_FIELD_IPV4,\n \t\t.input_index = SRCP_DESTP_INPUT_IPV4,\n \t\t.offset = sizeof(struct rte_ether_hdr) +\n-\t\t\tsizeof(struct ipv4_hdr) +\n+\t\t\tsizeof(struct rte_ipv4_hdr) +\n \t\t\toffsetof(struct tcp_hdr, src_port),\n \t},\n \t{\n@@ -83,7 +83,7 @@ static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {\n \t\t.field_index = DSTP_FIELD_IPV4,\n \t\t.input_index = SRCP_DESTP_INPUT_IPV4,\n \t\t.offset = sizeof(struct rte_ether_hdr) +\n-\t\t\tsizeof(struct ipv4_hdr) +\n+\t\t\tsizeof(struct rte_ipv4_hdr) +\n \t\t\toffsetof(struct tcp_hdr, dst_port),\n \t},\n };\n@@ -490,7 +490,7 @@ init_ipv4_udp_traffic(struct rte_mempool *mp,\n \t     struct rte_mbuf **pkts_burst, uint32_t burst_size)\n {\n \tstruct rte_ether_hdr pkt_eth_hdr;\n-\tstruct ipv4_hdr pkt_ipv4_hdr;\n+\tstruct rte_ipv4_hdr pkt_ipv4_hdr;\n \tstruct udp_hdr pkt_udp_hdr;\n \tuint32_t src_addr = IPV4_ADDR(2, 2, 2, 3);\n \tuint32_t dst_addr = IPV4_ADDR(2, 2, 2, 7);\n@@ -527,7 +527,7 @@ init_ipv4_tcp_traffic(struct rte_mempool *mp,\n \t     struct rte_mbuf **pkts_burst, uint32_t burst_size)\n {\n \tstruct rte_ether_hdr pkt_eth_hdr;\n-\tstruct ipv4_hdr pkt_ipv4_hdr;\n+\tstruct rte_ipv4_hdr pkt_ipv4_hdr;\n \tstruct tcp_hdr pkt_tcp_hdr;\n \tuint32_t src_addr = IPV4_ADDR(1, 2, 3, 4);\n \tuint32_t dst_addr = IPV4_ADDR(5, 6, 7, 8);\n@@ -564,7 +564,7 @@ init_ipv4_sctp_traffic(struct rte_mempool *mp,\n \t     struct rte_mbuf **pkts_burst, uint32_t burst_size)\n {\n \tstruct rte_ether_hdr pkt_eth_hdr;\n-\tstruct ipv4_hdr pkt_ipv4_hdr;\n+\tstruct rte_ipv4_hdr pkt_ipv4_hdr;\n \tstruct sctp_hdr pkt_sctp_hdr;\n \tuint32_t src_addr = IPV4_ADDR(11, 12, 13, 14);\n \tuint32_t dst_addr = IPV4_ADDR(15, 16, 17, 18);\ndiff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c\nindex 7ad285a92..2cad4096c 100644\n--- a/app/test/test_ipsec.c\n+++ b/app/test/test_ipsec.c\n@@ -534,7 +534,7 @@ const char null_encrypted_data[] =\n \t\"Network Security People Have A Strange Sense Of Humor unlike Other \"\n \t\"People who have a normal sense of humour\";\n \n-struct ipv4_hdr ipv4_outer  = {\n+struct rte_ipv4_hdr ipv4_outer  = {\n \t.version_ihl = IPVERSION << 4 |\n \t\tsizeof(ipv4_outer) / IPV4_IHL_MULTIPLIER,\n \t.time_to_live = IPDEFTTL,\n@@ -572,7 +572,7 @@ setup_test_string_tunneled(struct rte_mempool *mpool, const char *string,\n \tsize_t len, uint32_t spi, uint32_t seq)\n {\n \tstruct rte_mbuf *m = rte_pktmbuf_alloc(mpool);\n-\tuint32_t hdrlen = sizeof(struct ipv4_hdr) + sizeof(struct rte_esp_hdr);\n+\tuint32_t hdrlen = sizeof(struct rte_ipv4_hdr) + sizeof(struct rte_esp_hdr);\n \tuint32_t taillen = sizeof(struct esp_tail);\n \tuint32_t t_len = len + hdrlen + taillen;\n \tuint32_t padlen;\ndiff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c\nindex 2490d5dd2..924de81ae 100644\n--- a/app/test/test_link_bonding.c\n+++ b/app/test/test_link_bonding.c\n@@ -78,14 +78,14 @@ struct link_bonding_unittest_params {\n \n \t/* Packet Headers */\n \tstruct rte_ether_hdr *pkt_eth_hdr;\n-\tstruct ipv4_hdr *pkt_ipv4_hdr;\n-\tstruct ipv6_hdr *pkt_ipv6_hdr;\n+\tstruct rte_ipv4_hdr *pkt_ipv4_hdr;\n+\tstruct rte_ipv6_hdr *pkt_ipv6_hdr;\n \tstruct udp_hdr *pkt_udp_hdr;\n \n };\n \n-static struct ipv4_hdr pkt_ipv4_hdr;\n-static struct ipv6_hdr pkt_ipv6_hdr;\n+static struct rte_ipv4_hdr pkt_ipv4_hdr;\n+static struct rte_ipv6_hdr pkt_ipv6_hdr;\n static struct udp_hdr pkt_udp_hdr;\n \n static struct link_bonding_unittest_params default_params  = {\ndiff --git a/app/test/test_link_bonding_mode4.c b/app/test/test_link_bonding_mode4.c\nindex 6295b1874..fba629d43 100644\n--- a/app/test/test_link_bonding_mode4.c\n+++ b/app/test/test_link_bonding_mode4.c\n@@ -734,8 +734,8 @@ generate_packets(struct rte_ether_addr *src_mac,\n \tstruct rte_ether_hdr pkt_eth_hdr;\n \tstruct udp_hdr pkt_udp_hdr;\n \tunion {\n-\t\tstruct ipv4_hdr v4;\n-\t\tstruct ipv6_hdr v6;\n+\t\tstruct rte_ipv4_hdr v4;\n+\t\tstruct rte_ipv6_hdr v6;\n \t} pkt_ip_hdr;\n \n \tint retval;\ndiff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c\nindex 4b973ffc4..0d1c1b1ab 100644\n--- a/app/test/test_pmd_perf.c\n+++ b/app/test/test_pmd_perf.c\n@@ -183,7 +183,7 @@ init_traffic(struct rte_mempool *mp,\n \t     struct rte_mbuf **pkts_burst, uint32_t burst_size)\n {\n \tstruct rte_ether_hdr pkt_eth_hdr;\n-\tstruct ipv4_hdr pkt_ipv4_hdr;\n+\tstruct rte_ipv4_hdr pkt_ipv4_hdr;\n \tstruct udp_hdr pkt_udp_hdr;\n \tuint32_t pktlen;\n \tstatic uint8_t src_mac[] = { 0x00, 0xFF, 0xAA, 0xFF, 0xAA, 0xFF };\ndiff --git a/app/test/test_sched.c b/app/test/test_sched.c\nindex 58f42a2d8..4781c2307 100644\n--- a/app/test/test_sched.c\n+++ b/app/test/test_sched.c\n@@ -80,14 +80,14 @@ prepare_pkt(struct rte_sched_port *port, struct rte_mbuf *mbuf)\n {\n \tstruct rte_ether_hdr *eth_hdr;\n \tstruct rte_vlan_hdr *vlan1, *vlan2;\n-\tstruct ipv4_hdr *ip_hdr;\n+\tstruct rte_ipv4_hdr *ip_hdr;\n \n \t/* Simulate a classifier */\n \teth_hdr = rte_pktmbuf_mtod(mbuf, struct rte_ether_hdr *);\n \tvlan1 = (struct rte_vlan_hdr *)(&eth_hdr->ether_type );\n \tvlan2 = (struct rte_vlan_hdr *)((uintptr_t)&eth_hdr->ether_type + sizeof(struct rte_vlan_hdr));\n \teth_hdr = (struct rte_ether_hdr *)((uintptr_t)&eth_hdr->ether_type + 2 *sizeof(struct rte_vlan_hdr));\n-\tip_hdr = (struct ipv4_hdr *)((uintptr_t)eth_hdr +  sizeof(eth_hdr->ether_type));\n+\tip_hdr = (struct rte_ipv4_hdr *)((uintptr_t)eth_hdr +  sizeof(eth_hdr->ether_type));\n \n \tvlan1->vlan_tci = rte_cpu_to_be_16(SUBPORT);\n \tvlan2->vlan_tci = rte_cpu_to_be_16(PIPE);\ndiff --git a/app/test/test_thash.c b/app/test/test_thash.c\nindex 61754a947..bf332c9e9 100644\n--- a/app/test/test_thash.c\n+++ b/app/test/test_thash.c\n@@ -110,7 +110,7 @@ test_thash(void)\n \tunion rte_thash_tuple tuple;\n \tuint32_t rss_l3, rss_l3l4;\n \tuint8_t rss_key_be[RTE_DIM(default_rss_key)];\n-\tstruct ipv6_hdr ipv6_hdr;\n+\tstruct rte_ipv6_hdr ipv6_hdr;\n \n \t/* Convert RSS key*/\n \trte_convert_rss_key((uint32_t *)&default_rss_key,\ndiff --git a/doc/guides/prog_guide/packet_classif_access_ctrl.rst b/doc/guides/prog_guide/packet_classif_access_ctrl.rst\nindex 395b3ec47..6887e4dc6 100644\n--- a/doc/guides/prog_guide/packet_classif_access_ctrl.rst\n+++ b/doc/guides/prog_guide/packet_classif_access_ctrl.rst\n@@ -154,7 +154,7 @@ To define classification for the IPv6 2-tuple: <protocol, IPv6 source address> o\n \n .. code-block:: c\n \n-    struct struct ipv6_hdr {\n+    struct struct rte_ipv6_hdr {\n         uint32_t vtc_flow;     /* IP version, traffic class & flow label. */\n         uint16_t payload_len;  /* IP packet length - includes sizeof(ip_header). */\n         uint8_t proto;         /* Protocol, next header. */\n@@ -173,7 +173,7 @@ The following array of field definitions can be used:\n             .size = sizeof (uint8_t),\n             .field_index = 0,\n             .input_index = 0,\n-            .offset = offsetof (struct ipv6_hdr, proto),\n+            .offset = offsetof (struct rte_ipv6_hdr, proto),\n         },\n \n         {\n@@ -181,7 +181,7 @@ The following array of field definitions can be used:\n             .size = sizeof (uint32_t),\n             .field_index = 1,\n             .input_index = 1,\n-            .offset = offsetof (struct ipv6_hdr, src_addr[0]),\n+            .offset = offsetof (struct rte_ipv6_hdr, src_addr[0]),\n         },\n \n         {\n@@ -189,7 +189,7 @@ The following array of field definitions can be used:\n             .size = sizeof (uint32_t),\n             .field_index = 2,\n             .input_index = 2,\n-            .offset = offsetof (struct ipv6_hdr, src_addr[4]),\n+            .offset = offsetof (struct rte_ipv6_hdr, src_addr[4]),\n         },\n \n         {\n@@ -197,7 +197,7 @@ The following array of field definitions can be used:\n             .size = sizeof (uint32_t),\n             .field_index = 3,\n             .input_index = 3,\n-           .offset = offsetof (struct ipv6_hdr, src_addr[8]),\n+           .offset = offsetof (struct rte_ipv6_hdr, src_addr[8]),\n         },\n \n         {\n@@ -205,7 +205,7 @@ The following array of field definitions can be used:\n            .size = sizeof (uint32_t),\n            .field_index = 4,\n            .input_index = 4,\n-           .offset = offsetof (struct ipv6_hdr, src_addr[12]),\n+           .offset = offsetof (struct rte_ipv6_hdr, src_addr[12]),\n         },\n     };\n \ndiff --git a/doc/guides/sample_app_ug/flow_classify.rst b/doc/guides/sample_app_ug/flow_classify.rst\nindex 762c3844e..46703acbf 100644\n--- a/doc/guides/sample_app_ug/flow_classify.rst\n+++ b/doc/guides/sample_app_ug/flow_classify.rst\n@@ -92,7 +92,7 @@ initialisation of the ``Flow Classify`` application..\n             .field_index = PROTO_FIELD_IPV4,\n             .input_index = PROTO_INPUT_IPV4,\n             .offset = sizeof(struct rte_ether_hdr) +\n-                offsetof(struct ipv4_hdr, next_proto_id),\n+                offsetof(struct rte_ipv4_hdr, next_proto_id),\n         },\n         /* next input field (IPv4 source address) - 4 consecutive bytes. */\n         {\n@@ -102,7 +102,7 @@ initialisation of the ``Flow Classify`` application..\n             .field_index = SRC_FIELD_IPV4,\n             .input_index = SRC_INPUT_IPV4,\n             .offset = sizeof(struct rte_ether_hdr) +\n-                offsetof(struct ipv4_hdr, src_addr),\n+                offsetof(struct rte_ipv4_hdr, src_addr),\n         },\n         /* next input field (IPv4 destination address) - 4 consecutive bytes. */\n         {\n@@ -112,7 +112,7 @@ initialisation of the ``Flow Classify`` application..\n             .field_index = DST_FIELD_IPV4,\n             .input_index = DST_INPUT_IPV4,\n             .offset = sizeof(struct rte_ether_hdr) +\n-                offsetof(struct ipv4_hdr, dst_addr),\n+                offsetof(struct rte_ipv4_hdr, dst_addr),\n         },\n         /*\n          * Next 2 fields (src & dst ports) form 4 consecutive bytes.\n@@ -125,7 +125,7 @@ initialisation of the ``Flow Classify`` application..\n             .field_index = SRCP_FIELD_IPV4,\n             .input_index = SRCP_DESTP_INPUT_IPV4,\n             .offset = sizeof(struct rte_ether_hdr) +\n-                sizeof(struct ipv4_hdr) +\n+                sizeof(struct rte_ipv4_hdr) +\n                 offsetof(struct tcp_hdr, src_port),\n         },\n         {\n@@ -135,7 +135,7 @@ initialisation of the ``Flow Classify`` application..\n              .field_index = DSTP_FIELD_IPV4,\n              .input_index = SRCP_DESTP_INPUT_IPV4,\n              .offset = sizeof(struct rte_ether_hdr) +\n-                 sizeof(struct ipv4_hdr) +\n+                 sizeof(struct rte_ipv4_hdr) +\n                  offsetof(struct tcp_hdr, dst_port),\n         },\n     };\ndiff --git a/doc/guides/sample_app_ug/ipv4_multicast.rst b/doc/guides/sample_app_ug/ipv4_multicast.rst\nindex a4cb4377f..46c920433 100644\n--- a/doc/guides/sample_app_ug/ipv4_multicast.rst\n+++ b/doc/guides/sample_app_ug/ipv4_multicast.rst\n@@ -146,7 +146,7 @@ Firstly, the Ethernet* header is removed from the packet and the IPv4 address is\n \n     /* Remove the Ethernet header from the input packet */\n \n-    iphdr = (struct ipv4_hdr *)rte_pktmbuf_adj(m, sizeof(struct rte_ether_hdr));\n+    iphdr = (struct rte_ipv4_hdr *)rte_pktmbuf_adj(m, sizeof(struct rte_ether_hdr));\n     RTE_ASSERT(iphdr != NULL);\n     dest_addr = rte_be_to_cpu_32(iphdr->dst_addr);\n \ndiff --git a/doc/guides/sample_app_ug/l3_forward.rst b/doc/guides/sample_app_ug/l3_forward.rst\nindex 58c4aae92..bf6c5ea52 100644\n--- a/doc/guides/sample_app_ug/l3_forward.rst\n+++ b/doc/guides/sample_app_ug/l3_forward.rst\n@@ -242,7 +242,7 @@ The get_ipv4_dst_port() function is shown below:\n         int ret = 0;\n         union ipv4_5tuple_host key;\n \n-        ipv4_hdr = (uint8_t *)ipv4_hdr + offsetof(struct ipv4_hdr, time_to_live);\n+        ipv4_hdr = (uint8_t *)ipv4_hdr + offsetof(struct rte_ipv4_hdr, time_to_live);\n \n         m128i data = _mm_loadu_si128(( m128i*)(ipv4_hdr));\n \n@@ -270,10 +270,10 @@ The key code snippet of simple_ipv4_fwd_4pkts() is shown below:\n     {\n         // ...\n \n-        data[0] = _mm_loadu_si128(( m128i*)(rte_pktmbuf_mtod(m[0], unsigned char *) + sizeof(struct rte_ether_hdr) + offsetof(struct ipv4_hdr, time_to_live)));\n-        data[1] = _mm_loadu_si128(( m128i*)(rte_pktmbuf_mtod(m[1], unsigned char *) + sizeof(struct rte_ether_hdr) + offsetof(struct ipv4_hdr, time_to_live)));\n-        data[2] = _mm_loadu_si128(( m128i*)(rte_pktmbuf_mtod(m[2], unsigned char *) + sizeof(struct rte_ether_hdr) + offsetof(struct ipv4_hdr, time_to_live)));\n-        data[3] = _mm_loadu_si128(( m128i*)(rte_pktmbuf_mtod(m[3], unsigned char *) + sizeof(struct rte_ether_hdr) + offsetof(struct ipv4_hdr, time_to_live)));\n+        data[0] = _mm_loadu_si128(( m128i*)(rte_pktmbuf_mtod(m[0], unsigned char *) + sizeof(struct rte_ether_hdr) + offsetof(struct rte_ipv4_hdr, time_to_live)));\n+        data[1] = _mm_loadu_si128(( m128i*)(rte_pktmbuf_mtod(m[1], unsigned char *) + sizeof(struct rte_ether_hdr) + offsetof(struct rte_ipv4_hdr, time_to_live)));\n+        data[2] = _mm_loadu_si128(( m128i*)(rte_pktmbuf_mtod(m[2], unsigned char *) + sizeof(struct rte_ether_hdr) + offsetof(struct rte_ipv4_hdr, time_to_live)));\n+        data[3] = _mm_loadu_si128(( m128i*)(rte_pktmbuf_mtod(m[3], unsigned char *) + sizeof(struct rte_ether_hdr) + offsetof(struct rte_ipv4_hdr, time_to_live)));\n \n         key[0].xmm = _mm_and_si128(data[0], mask0);\n         key[1].xmm = _mm_and_si128(data[1], mask0);\n@@ -306,7 +306,7 @@ for LPM-based lookups is done by the get_ipv4_dst_port() function below:\n .. code-block:: c\n \n     static inline uint16_t\n-    get_ipv4_dst_port(struct ipv4_hdr *ipv4_hdr, uint16_t portid, lookup_struct_t *ipv4_l3fwd_lookup_struct)\n+    get_ipv4_dst_port(struct rte_ipv4_hdr *ipv4_hdr, uint16_t portid, lookup_struct_t *ipv4_l3fwd_lookup_struct)\n     {\n         uint8_t next_hop;\n \ndiff --git a/doc/guides/sample_app_ug/server_node_efd.rst b/doc/guides/sample_app_ug/server_node_efd.rst\nindex f7dab9e98..12208f425 100644\n--- a/doc/guides/sample_app_ug/server_node_efd.rst\n+++ b/doc/guides/sample_app_ug/server_node_efd.rst\n@@ -191,12 +191,12 @@ which tells the node where the packet has to be distributed.\n         efd_value_t data[EFD_BURST_MAX];\n         const void *key_ptrs[EFD_BURST_MAX];\n \n-        struct ipv4_hdr *ipv4_hdr;\n+        struct rte_ipv4_hdr *ipv4_hdr;\n         uint32_t ipv4_dst_ip[EFD_BURST_MAX];\n \n         for (i = 0; i < rx_count; i++) {\n             /* Handle IPv4 header.*/\n-            ipv4_hdr = rte_pktmbuf_mtod_offset(pkts[i], struct ipv4_hdr *,\n+            ipv4_hdr = rte_pktmbuf_mtod_offset(pkts[i], struct rte_ipv4_hdr *,\n                     sizeof(struct rte_ether_hdr));\n             ipv4_dst_ip[i] = ipv4_hdr->dst_addr;\n             key_ptrs[i] = (void *)&ipv4_dst_ip[i];\n@@ -348,7 +348,7 @@ flow is not handled by the node.\n     static inline void\n     handle_packets(struct rte_hash *h, struct rte_mbuf **bufs, uint16_t num_packets)\n     {\n-        struct ipv4_hdr *ipv4_hdr;\n+        struct rte_ipv4_hdr *ipv4_hdr;\n         uint32_t ipv4_dst_ip[PKT_READ_SIZE];\n         const void *key_ptrs[PKT_READ_SIZE];\n         unsigned int i;\n@@ -356,7 +356,7 @@ flow is not handled by the node.\n \n         for (i = 0; i < num_packets; i++) {\n             /* Handle IPv4 header.*/\n-            ipv4_hdr = rte_pktmbuf_mtod_offset(bufs[i], struct ipv4_hdr *,\n+            ipv4_hdr = rte_pktmbuf_mtod_offset(bufs[i], struct rte_ipv4_hdr *,\n                     sizeof(struct rte_ether_hdr));\n             ipv4_dst_ip[i] = ipv4_hdr->dst_addr;\n             key_ptrs[i] = &ipv4_dst_ip[i];\ndiff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c\nindex 58c23a970..c7fcd9b8e 100644\n--- a/drivers/net/bonding/rte_eth_bond_pmd.c\n+++ b/drivers/net/bonding/rte_eth_bond_pmd.c\n@@ -587,7 +587,7 @@ static void\n mode6_debug(const char __attribute__((unused)) *info, struct rte_ether_hdr *eth_h,\n \t\tuint16_t port, uint32_t __attribute__((unused)) *burstnumber)\n {\n-\tstruct ipv4_hdr *ipv4_h;\n+\tstruct rte_ipv4_hdr *ipv4_h;\n #ifdef RTE_LIBRTE_BOND_DEBUG_ALB\n \tstruct rte_arp_hdr *arp_h;\n \tchar dst_ip[16];\n@@ -604,7 +604,7 @@ mode6_debug(const char __attribute__((unused)) *info, struct rte_ether_hdr *eth_\n #endif\n \n \tif (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) {\n-\t\tipv4_h = (struct ipv4_hdr *)((char *)(eth_h + 1) + offset);\n+\t\tipv4_h = (struct rte_ipv4_hdr *)((char *)(eth_h + 1) + offset);\n \t\tipv4_addr_to_dot(ipv4_h->src_addr, src_ip, MaxIPv4String);\n #ifdef RTE_LIBRTE_BOND_DEBUG_ALB\n \t\tipv4_addr_to_dot(ipv4_h->dst_addr, dst_ip, MaxIPv4String);\n@@ -751,13 +751,13 @@ ether_hash(struct rte_ether_hdr *eth_hdr)\n }\n \n static inline uint32_t\n-ipv4_hash(struct ipv4_hdr *ipv4_hdr)\n+ipv4_hash(struct rte_ipv4_hdr *ipv4_hdr)\n {\n \treturn ipv4_hdr->src_addr ^ ipv4_hdr->dst_addr;\n }\n \n static inline uint32_t\n-ipv6_hash(struct ipv6_hdr *ipv6_hdr)\n+ipv6_hash(struct rte_ipv6_hdr *ipv6_hdr)\n {\n \tunaligned_uint32_t *word_src_addr =\n \t\t(unaligned_uint32_t *)&(ipv6_hdr->src_addr[0]);\n@@ -808,12 +808,12 @@ burst_xmit_l23_hash(struct rte_mbuf **buf, uint16_t nb_pkts,\n \t\tvlan_offset = get_vlan_offset(eth_hdr, &proto);\n \n \t\tif (rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4) == proto) {\n-\t\t\tstruct ipv4_hdr *ipv4_hdr = (struct ipv4_hdr *)\n+\t\t\tstruct rte_ipv4_hdr *ipv4_hdr = (struct rte_ipv4_hdr *)\n \t\t\t\t\t((char *)(eth_hdr + 1) + vlan_offset);\n \t\t\tl3hash = ipv4_hash(ipv4_hdr);\n \n \t\t} else if (rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6) == proto) {\n-\t\t\tstruct ipv6_hdr *ipv6_hdr = (struct ipv6_hdr *)\n+\t\t\tstruct rte_ipv6_hdr *ipv6_hdr = (struct rte_ipv6_hdr *)\n \t\t\t\t\t((char *)(eth_hdr + 1) + vlan_offset);\n \t\t\tl3hash = ipv6_hash(ipv6_hdr);\n \t\t}\n@@ -847,7 +847,7 @@ burst_xmit_l34_hash(struct rte_mbuf **buf, uint16_t nb_pkts,\n \t\tl4hash = 0;\n \n \t\tif (rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4) == proto) {\n-\t\t\tstruct ipv4_hdr *ipv4_hdr = (struct ipv4_hdr *)\n+\t\t\tstruct rte_ipv4_hdr *ipv4_hdr = (struct rte_ipv4_hdr *)\n \t\t\t\t\t((char *)(eth_hdr + 1) + vlan_offset);\n \t\t\tsize_t ip_hdr_offset;\n \n@@ -874,7 +874,7 @@ burst_xmit_l34_hash(struct rte_mbuf **buf, uint16_t nb_pkts,\n \t\t\t\t}\n \t\t\t}\n \t\t} else if  (rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6) == proto) {\n-\t\t\tstruct ipv6_hdr *ipv6_hdr = (struct ipv6_hdr *)\n+\t\t\tstruct rte_ipv6_hdr *ipv6_hdr = (struct rte_ipv6_hdr *)\n \t\t\t\t\t((char *)(eth_hdr + 1) + vlan_offset);\n \t\t\tl3hash = ipv6_hash(ipv6_hdr);\n \ndiff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c\nindex ff061df25..63243a79a 100644\n--- a/drivers/net/dpaa/dpaa_rxtx.c\n+++ b/drivers/net/dpaa/dpaa_rxtx.c\n@@ -200,22 +200,22 @@ static inline void dpaa_checksum(struct rte_mbuf *mbuf)\n {\n \tstruct rte_ether_hdr *eth_hdr = rte_pktmbuf_mtod(mbuf, struct rte_ether_hdr *);\n \tchar *l3_hdr = (char *)eth_hdr + mbuf->l2_len;\n-\tstruct ipv4_hdr *ipv4_hdr = (struct ipv4_hdr *)l3_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr = (struct ipv6_hdr *)l3_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr = (struct rte_ipv4_hdr *)l3_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr = (struct rte_ipv6_hdr *)l3_hdr;\n \n \tDPAA_DP_LOG(DEBUG, \"Calculating checksum for mbuf: %p\", mbuf);\n \n \tif (((mbuf->packet_type & RTE_PTYPE_L3_MASK) == RTE_PTYPE_L3_IPV4) ||\n \t    ((mbuf->packet_type & RTE_PTYPE_L3_MASK) ==\n \t    RTE_PTYPE_L3_IPV4_EXT)) {\n-\t\tipv4_hdr = (struct ipv4_hdr *)l3_hdr;\n+\t\tipv4_hdr = (struct rte_ipv4_hdr *)l3_hdr;\n \t\tipv4_hdr->hdr_checksum = 0;\n \t\tipv4_hdr->hdr_checksum = rte_ipv4_cksum(ipv4_hdr);\n \t} else if (((mbuf->packet_type & RTE_PTYPE_L3_MASK) ==\n \t\t   RTE_PTYPE_L3_IPV6) ||\n \t\t   ((mbuf->packet_type & RTE_PTYPE_L3_MASK) ==\n \t\t   RTE_PTYPE_L3_IPV6_EXT))\n-\t\tipv6_hdr = (struct ipv6_hdr *)l3_hdr;\n+\t\tipv6_hdr = (struct rte_ipv6_hdr *)l3_hdr;\n \n \tif ((mbuf->packet_type & RTE_PTYPE_L4_MASK) == RTE_PTYPE_L4_TCP) {\n \t\tstruct tcp_hdr *tcp_hdr = (struct tcp_hdr *)(l3_hdr +\ndiff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c\nindex e09cc8d49..f59215894 100644\n--- a/drivers/net/e1000/em_rxtx.c\n+++ b/drivers/net/e1000/em_rxtx.c\n@@ -222,7 +222,7 @@ em_set_xmit_ctx(struct em_tx_queue* txq,\n \t/* setup IPCS* fields */\n \tctx.lower_setup.ip_fields.ipcss = (uint8_t)l2len;\n \tctx.lower_setup.ip_fields.ipcso = (uint8_t)(l2len +\n-\t\t\toffsetof(struct ipv4_hdr, hdr_checksum));\n+\t\t\toffsetof(struct rte_ipv4_hdr, hdr_checksum));\n \n \t/*\n \t * When doing checksum or TCP segmentation with IPv6 headers,\ndiff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex 62986b6d6..469d7aaf6 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -2136,7 +2136,7 @@ eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \tuint32_t i;\n \tstruct rte_mbuf *m;\n \tstruct ena_ring *tx_ring = (struct ena_ring *)(tx_queue);\n-\tstruct ipv4_hdr *ip_hdr;\n+\tstruct rte_ipv4_hdr *ip_hdr;\n \tuint64_t ol_flags;\n \tuint16_t frag_field;\n \n@@ -2153,7 +2153,7 @@ eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\tif (unlikely(m->l2_len == 0))\n \t\t\tm->l2_len = sizeof(struct rte_ether_hdr);\n \n-\t\tip_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,\n+\t\tip_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *,\n \t\t\t\t\t\t m->l2_len);\n \t\tfrag_field = rte_be_to_cpu_16(ip_hdr->fragment_offset);\n \ndiff --git a/drivers/net/enic/enic_clsf.c b/drivers/net/enic/enic_clsf.c\nindex 48c8e6264..6bdc5a09a 100644\n--- a/drivers/net/enic/enic_clsf.c\n+++ b/drivers/net/enic/enic_clsf.c\n@@ -183,9 +183,9 @@ copy_fltr_v2(struct filter_v2 *fltr, const struct rte_eth_fdir_input *input,\n \t    input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV4_TCP ||\n \t    input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV4_SCTP ||\n \t    input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV4_OTHER) {\n-\t\tstruct ipv4_hdr ip4_mask, ip4_val;\n-\t\tmemset(&ip4_mask, 0, sizeof(struct ipv4_hdr));\n-\t\tmemset(&ip4_val, 0, sizeof(struct ipv4_hdr));\n+\t\tstruct rte_ipv4_hdr ip4_mask, ip4_val;\n+\t\tmemset(&ip4_mask, 0, sizeof(struct rte_ipv4_hdr));\n+\t\tmemset(&ip4_val, 0, sizeof(struct rte_ipv4_hdr));\n \n \t\tif (input->flow.ip4_flow.tos) {\n \t\t\tip4_mask.type_of_service = masks->ipv4_mask.tos;\n@@ -213,7 +213,7 @@ copy_fltr_v2(struct filter_v2 *fltr, const struct rte_eth_fdir_input *input,\n \t\t}\n \n \t\tenic_set_layer(gp, FILTER_GENERIC_1_IPV4, FILTER_GENERIC_1_L3,\n-\t\t\t       &ip4_mask, &ip4_val, sizeof(struct ipv4_hdr));\n+\t\t\t       &ip4_mask, &ip4_val, sizeof(struct rte_ipv4_hdr));\n \t}\n \n \tif (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_UDP) {\n@@ -272,9 +272,9 @@ copy_fltr_v2(struct filter_v2 *fltr, const struct rte_eth_fdir_input *input,\n \t    input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_TCP ||\n \t    input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_SCTP ||\n \t    input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_OTHER) {\n-\t\tstruct ipv6_hdr ipv6_mask, ipv6_val;\n-\t\tmemset(&ipv6_mask, 0, sizeof(struct ipv6_hdr));\n-\t\tmemset(&ipv6_val, 0, sizeof(struct ipv6_hdr));\n+\t\tstruct rte_ipv6_hdr ipv6_mask, ipv6_val;\n+\t\tmemset(&ipv6_mask, 0, sizeof(struct rte_ipv6_hdr));\n+\t\tmemset(&ipv6_val, 0, sizeof(struct rte_ipv6_hdr));\n \n \t\tif (input->flow.ipv6_flow.proto) {\n \t\t\tipv6_mask.proto = masks->ipv6_mask.proto;\n@@ -302,7 +302,7 @@ copy_fltr_v2(struct filter_v2 *fltr, const struct rte_eth_fdir_input *input,\n \t\t}\n \n \t\tenic_set_layer(gp, FILTER_GENERIC_1_IPV6, FILTER_GENERIC_1_L3,\n-\t\t\t       &ipv6_mask, &ipv6_val, sizeof(struct ipv6_hdr));\n+\t\t\t       &ipv6_mask, &ipv6_val, sizeof(struct rte_ipv6_hdr));\n \t}\n }\n \ndiff --git a/drivers/net/enic/enic_flow.c b/drivers/net/enic/enic_flow.c\nindex 4996fdf8a..b1a9bcbde 100644\n--- a/drivers/net/enic/enic_flow.c\n+++ b/drivers/net/enic/enic_flow.c\n@@ -410,7 +410,7 @@ enic_copy_item_ipv4_v1(struct copy_item_args *arg)\n \tconst struct rte_flow_item_ipv4 *spec = item->spec;\n \tconst struct rte_flow_item_ipv4 *mask = item->mask;\n \tstruct filter_ipv4_5tuple *enic_5tup = &enic_filter->u.ipv4;\n-\tstruct ipv4_hdr supported_mask = {\n+\tstruct rte_ipv4_hdr supported_mask = {\n \t\t.src_addr = 0xffffffff,\n \t\t.dst_addr = 0xffffffff,\n \t};\n@@ -605,9 +605,9 @@ enic_copy_item_inner_ipv4_v2(struct copy_item_args *arg)\n \tif (!mask)\n \t\tmask = &rte_flow_item_ipv4_mask;\n \t/* Append ipv4 header to L5 and set ether type = ipv4 */\n-\targ->l3_proto_off = *off + offsetof(struct ipv4_hdr, next_proto_id);\n+\targ->l3_proto_off = *off + offsetof(struct rte_ipv4_hdr, next_proto_id);\n \treturn copy_inner_common(&arg->filter->u.generic_1, off,\n-\t\targ->item->spec, mask, sizeof(struct ipv4_hdr),\n+\t\targ->item->spec, mask, sizeof(struct rte_ipv4_hdr),\n \t\targ->l2_proto_off, rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4), 2);\n }\n \n@@ -621,9 +621,9 @@ enic_copy_item_inner_ipv6_v2(struct copy_item_args *arg)\n \tif (!mask)\n \t\tmask = &rte_flow_item_ipv6_mask;\n \t/* Append ipv6 header to L5 and set ether type = ipv6 */\n-\targ->l3_proto_off = *off + offsetof(struct ipv6_hdr, proto);\n+\targ->l3_proto_off = *off + offsetof(struct rte_ipv6_hdr, proto);\n \treturn copy_inner_common(&arg->filter->u.generic_1, off,\n-\t\targ->item->spec, mask, sizeof(struct ipv6_hdr),\n+\t\targ->item->spec, mask, sizeof(struct rte_ipv6_hdr),\n \t\targ->l2_proto_off, rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6), 2);\n }\n \n@@ -758,9 +758,9 @@ enic_copy_item_ipv4_v2(struct copy_item_args *arg)\n \t\tmask = &rte_flow_item_ipv4_mask;\n \n \tmemcpy(gp->layer[FILTER_GENERIC_1_L3].mask, &mask->hdr,\n-\t       sizeof(struct ipv4_hdr));\n+\t       sizeof(struct rte_ipv4_hdr));\n \tmemcpy(gp->layer[FILTER_GENERIC_1_L3].val, &spec->hdr,\n-\t       sizeof(struct ipv4_hdr));\n+\t       sizeof(struct rte_ipv4_hdr));\n \treturn 0;\n }\n \n@@ -787,9 +787,9 @@ enic_copy_item_ipv6_v2(struct copy_item_args *arg)\n \t\tmask = &rte_flow_item_ipv6_mask;\n \n \tmemcpy(gp->layer[FILTER_GENERIC_1_L3].mask, &mask->hdr,\n-\t       sizeof(struct ipv6_hdr));\n+\t       sizeof(struct rte_ipv6_hdr));\n \tmemcpy(gp->layer[FILTER_GENERIC_1_L3].val, &spec->hdr,\n-\t       sizeof(struct ipv6_hdr));\n+\t       sizeof(struct rte_ipv6_hdr));\n \treturn 0;\n }\n \n@@ -869,16 +869,16 @@ enic_copy_item_sctp_v2(struct copy_item_args *arg)\n \t * the protocol number in the IP pattern.\n \t */\n \tif (gp->val_flags & FILTER_GENERIC_1_IPV4) {\n-\t\tstruct ipv4_hdr *ip;\n-\t\tip = (struct ipv4_hdr *)gp->layer[FILTER_GENERIC_1_L3].mask;\n+\t\tstruct rte_ipv4_hdr *ip;\n+\t\tip = (struct rte_ipv4_hdr *)gp->layer[FILTER_GENERIC_1_L3].mask;\n \t\tip_proto_mask = &ip->next_proto_id;\n-\t\tip = (struct ipv4_hdr *)gp->layer[FILTER_GENERIC_1_L3].val;\n+\t\tip = (struct rte_ipv4_hdr *)gp->layer[FILTER_GENERIC_1_L3].val;\n \t\tip_proto = &ip->next_proto_id;\n \t} else if (gp->val_flags & FILTER_GENERIC_1_IPV6) {\n-\t\tstruct ipv6_hdr *ip;\n-\t\tip = (struct ipv6_hdr *)gp->layer[FILTER_GENERIC_1_L3].mask;\n+\t\tstruct rte_ipv6_hdr *ip;\n+\t\tip = (struct rte_ipv6_hdr *)gp->layer[FILTER_GENERIC_1_L3].mask;\n \t\tip_proto_mask = &ip->proto;\n-\t\tip = (struct ipv6_hdr *)gp->layer[FILTER_GENERIC_1_L3].val;\n+\t\tip = (struct rte_ipv6_hdr *)gp->layer[FILTER_GENERIC_1_L3].val;\n \t\tip_proto = &ip->proto;\n \t} else {\n \t\t/* Need IPv4/IPv6 pattern first */\ndiff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c\nindex 4aaf27f7c..b20f30fb4 100644\n--- a/drivers/net/i40e/i40e_fdir.c\n+++ b/drivers/net/i40e/i40e_fdir.c\n@@ -686,8 +686,8 @@ i40e_fdir_fill_eth_ip_head(const struct rte_eth_fdir_input *fdir_input,\n \tstatic uint8_t vlan_frame[] = {0x81, 0, 0, 0};\n \tuint16_t *ether_type;\n \tuint8_t len = 2 * sizeof(struct rte_ether_addr);\n-\tstruct ipv4_hdr *ip;\n-\tstruct ipv6_hdr *ip6;\n+\tstruct rte_ipv4_hdr *ip;\n+\tstruct rte_ipv6_hdr *ip6;\n \tstatic const uint8_t next_proto[] = {\n \t\t[RTE_ETH_FLOW_FRAG_IPV4] = IPPROTO_IP,\n \t\t[RTE_ETH_FLOW_NONFRAG_IPV4_TCP] = IPPROTO_TCP,\n@@ -723,7 +723,7 @@ i40e_fdir_fill_eth_ip_head(const struct rte_eth_fdir_input *fdir_input,\n \tcase RTE_ETH_FLOW_NONFRAG_IPV4_SCTP:\n \tcase RTE_ETH_FLOW_NONFRAG_IPV4_OTHER:\n \tcase RTE_ETH_FLOW_FRAG_IPV4:\n-\t\tip = (struct ipv4_hdr *)raw_pkt;\n+\t\tip = (struct rte_ipv4_hdr *)raw_pkt;\n \n \t\t*ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4);\n \t\tip->version_ihl = I40E_FDIR_IP_DEFAULT_VERSION_IHL;\n@@ -743,14 +743,14 @@ i40e_fdir_fill_eth_ip_head(const struct rte_eth_fdir_input *fdir_input,\n \t\t */\n \t\tip->src_addr = fdir_input->flow.ip4_flow.dst_ip;\n \t\tip->dst_addr = fdir_input->flow.ip4_flow.src_ip;\n-\t\tlen += sizeof(struct ipv4_hdr);\n+\t\tlen += sizeof(struct rte_ipv4_hdr);\n \t\tbreak;\n \tcase RTE_ETH_FLOW_NONFRAG_IPV6_TCP:\n \tcase RTE_ETH_FLOW_NONFRAG_IPV6_UDP:\n \tcase RTE_ETH_FLOW_NONFRAG_IPV6_SCTP:\n \tcase RTE_ETH_FLOW_NONFRAG_IPV6_OTHER:\n \tcase RTE_ETH_FLOW_FRAG_IPV6:\n-\t\tip6 = (struct ipv6_hdr *)raw_pkt;\n+\t\tip6 = (struct rte_ipv6_hdr *)raw_pkt;\n \n \t\t*ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6);\n \t\tip6->vtc_flow =\n@@ -776,7 +776,7 @@ i40e_fdir_fill_eth_ip_head(const struct rte_eth_fdir_input *fdir_input,\n \t\trte_memcpy(&(ip6->dst_addr),\n \t\t\t   &(fdir_input->flow.ipv6_flow.src_ip),\n \t\t\t   IPV6_ADDR_LEN);\n-\t\tlen += sizeof(struct ipv6_hdr);\n+\t\tlen += sizeof(struct rte_ipv6_hdr);\n \t\tbreak;\n \tdefault:\n \t\tPMD_DRV_LOG(ERR, \"unknown flow type %u.\",\n@@ -960,8 +960,8 @@ i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf *pf,\n \tstatic uint8_t vlan_frame[] = {0x81, 0, 0, 0};\n \tuint16_t *ether_type;\n \tuint8_t len = 2 * sizeof(struct rte_ether_addr);\n-\tstruct ipv4_hdr *ip;\n-\tstruct ipv6_hdr *ip6;\n+\tstruct rte_ipv4_hdr *ip;\n+\tstruct rte_ipv6_hdr *ip6;\n \tuint8_t pctype = fdir_input->pctype;\n \tbool is_customized_pctype = fdir_input->flow_ext.customized_pctype;\n \tstatic const uint8_t next_proto[] = {\n@@ -1007,7 +1007,7 @@ i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf *pf,\n \t\t pctype == I40E_FILTER_PCTYPE_NONF_IPV4_OTHER ||\n \t\t pctype == I40E_FILTER_PCTYPE_FRAG_IPV4 ||\n \t\t is_customized_pctype) {\n-\t\tip = (struct ipv4_hdr *)raw_pkt;\n+\t\tip = (struct rte_ipv4_hdr *)raw_pkt;\n \n \t\t*ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4);\n \t\tip->version_ihl = I40E_FDIR_IP_DEFAULT_VERSION_IHL;\n@@ -1034,13 +1034,13 @@ i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf *pf,\n \t\t\t cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV6 ||\n \t\t\t cus_pctype->index == I40E_CUSTOMIZED_GTPU)\n \t\t\tip->next_proto_id = IPPROTO_UDP;\n-\t\tlen += sizeof(struct ipv4_hdr);\n+\t\tlen += sizeof(struct rte_ipv4_hdr);\n \t} else if (pctype == I40E_FILTER_PCTYPE_NONF_IPV6_TCP ||\n \t\t   pctype == I40E_FILTER_PCTYPE_NONF_IPV6_UDP ||\n \t\t   pctype == I40E_FILTER_PCTYPE_NONF_IPV6_SCTP ||\n \t\t   pctype == I40E_FILTER_PCTYPE_NONF_IPV6_OTHER ||\n \t\t   pctype == I40E_FILTER_PCTYPE_FRAG_IPV6) {\n-\t\tip6 = (struct ipv6_hdr *)raw_pkt;\n+\t\tip6 = (struct rte_ipv6_hdr *)raw_pkt;\n \n \t\t*ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6);\n \t\tip6->vtc_flow =\n@@ -1066,7 +1066,7 @@ i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf *pf,\n \t\trte_memcpy(&ip6->dst_addr,\n \t\t\t   &fdir_input->flow.ipv6_flow.src_ip,\n \t\t\t   IPV6_ADDR_LEN);\n-\t\tlen += sizeof(struct ipv6_hdr);\n+\t\tlen += sizeof(struct rte_ipv6_hdr);\n \t} else {\n \t\tPMD_DRV_LOG(ERR, \"unknown pctype %u.\",\n \t\t\t    fdir_input->pctype);\n@@ -1093,8 +1093,8 @@ i40e_flow_fdir_construct_pkt(struct i40e_pf *pf,\n \tstruct tcp_hdr *tcp;\n \tstruct sctp_hdr *sctp;\n \tstruct rte_flow_item_gtp *gtp;\n-\tstruct ipv4_hdr *gtp_ipv4;\n-\tstruct ipv6_hdr *gtp_ipv6;\n+\tstruct rte_ipv4_hdr *gtp_ipv4;\n+\tstruct rte_ipv6_hdr *gtp_ipv6;\n \tuint8_t size, dst = 0;\n \tuint8_t i, pit_idx, set_idx = I40E_FLXPLD_L4_IDX; /* use l4 by default*/\n \tint len;\n@@ -1232,7 +1232,7 @@ i40e_flow_fdir_construct_pkt(struct i40e_pf *pf,\n \n \t\t\tif (cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV4) {\n \t\t\t\tgtp->msg_type = I40E_FDIR_GTP_MSG_TYPE_0XFF;\n-\t\t\t\tgtp_ipv4 = (struct ipv4_hdr *)\n+\t\t\t\tgtp_ipv4 = (struct rte_ipv4_hdr *)\n \t\t\t\t\t((unsigned char *)gtp +\n \t\t\t\t\t sizeof(struct rte_flow_item_gtp));\n \t\t\t\tgtp_ipv4->version_ihl =\n@@ -1242,11 +1242,11 @@ i40e_flow_fdir_construct_pkt(struct i40e_pf *pf,\n \t\t\t\t\trte_cpu_to_be_16(\n \t\t\t\t\t\tI40E_FDIR_INNER_IP_DEFAULT_LEN);\n \t\t\t\tpayload = (unsigned char *)gtp_ipv4 +\n-\t\t\t\t\tsizeof(struct ipv4_hdr);\n+\t\t\t\t\tsizeof(struct rte_ipv4_hdr);\n \t\t\t} else if (cus_pctype->index ==\n \t\t\t\t   I40E_CUSTOMIZED_GTPU_IPV6) {\n \t\t\t\tgtp->msg_type = I40E_FDIR_GTP_MSG_TYPE_0XFF;\n-\t\t\t\tgtp_ipv6 = (struct ipv6_hdr *)\n+\t\t\t\tgtp_ipv6 = (struct rte_ipv6_hdr *)\n \t\t\t\t\t((unsigned char *)gtp +\n \t\t\t\t\t sizeof(struct rte_flow_item_gtp));\n \t\t\t\tgtp_ipv6->vtc_flow =\n@@ -1260,7 +1260,7 @@ i40e_flow_fdir_construct_pkt(struct i40e_pf *pf,\n \t\t\t\tgtp_ipv6->hop_limits =\n \t\t\t\t\tI40E_FDIR_IPv6_DEFAULT_HOP_LIMITS;\n \t\t\t\tpayload = (unsigned char *)gtp_ipv6 +\n-\t\t\t\t\tsizeof(struct ipv6_hdr);\n+\t\t\t\t\tsizeof(struct rte_ipv6_hdr);\n \t\t\t} else\n \t\t\t\tpayload = (unsigned char *)gtp +\n \t\t\t\t\tsizeof(struct rte_flow_item_gtp);\ndiff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex 9dc492ad2..43a5dd4cb 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -2538,13 +2538,13 @@ flow_fdir_filter_convert(struct rte_eth_dev *dev,\n \tcase RTE_ETH_FLOW_NONFRAG_IPV4_UDP:\n \tcase RTE_ETH_FLOW_NONFRAG_IPV4_TCP:\n \tcase RTE_ETH_FLOW_NONFRAG_IPV4_OTHER:\n-\t\tattributes->l3.ipv4.hdr = (struct ipv4_hdr){\n+\t\tattributes->l3.ipv4.hdr = (struct rte_ipv4_hdr){\n \t\t\t.src_addr = input->flow.ip4_flow.src_ip,\n \t\t\t.dst_addr = input->flow.ip4_flow.dst_ip,\n \t\t\t.time_to_live = input->flow.ip4_flow.ttl,\n \t\t\t.type_of_service = input->flow.ip4_flow.tos,\n \t\t};\n-\t\tattributes->l3_mask.ipv4.hdr = (struct ipv4_hdr){\n+\t\tattributes->l3_mask.ipv4.hdr = (struct rte_ipv4_hdr){\n \t\t\t.src_addr = mask->ipv4_mask.src_ip,\n \t\t\t.dst_addr = mask->ipv4_mask.dst_ip,\n \t\t\t.time_to_live = mask->ipv4_mask.ttl,\n@@ -2560,7 +2560,7 @@ flow_fdir_filter_convert(struct rte_eth_dev *dev,\n \tcase RTE_ETH_FLOW_NONFRAG_IPV6_UDP:\n \tcase RTE_ETH_FLOW_NONFRAG_IPV6_TCP:\n \tcase RTE_ETH_FLOW_NONFRAG_IPV6_OTHER:\n-\t\tattributes->l3.ipv6.hdr = (struct ipv6_hdr){\n+\t\tattributes->l3.ipv6.hdr = (struct rte_ipv6_hdr){\n \t\t\t.hop_limits = input->flow.ipv6_flow.hop_limits,\n \t\t\t.proto = input->flow.ipv6_flow.proto,\n \t\t};\ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex a4c7529cf..d2a725469 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -1052,8 +1052,8 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,\n {\n \tstruct rte_ether_hdr *eth = NULL;\n \tstruct rte_vlan_hdr *vlan = NULL;\n-\tstruct ipv4_hdr *ipv4 = NULL;\n-\tstruct ipv6_hdr *ipv6 = NULL;\n+\tstruct rte_ipv4_hdr *ipv4 = NULL;\n+\tstruct rte_ipv6_hdr *ipv6 = NULL;\n \tstruct udp_hdr *udp = NULL;\n \tstruct rte_vxlan_hdr *vxlan = NULL;\n \tstruct rte_vxlan_gpe_hdr *vxlan_gpe = NULL;\n@@ -1089,7 +1089,7 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,\n \t\t\t\teth->ether_type = RTE_BE16(RTE_ETHER_TYPE_VLAN);\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_IPV4:\n-\t\t\tipv4 = (struct ipv4_hdr *)&buf[temp_size];\n+\t\t\tipv4 = (struct rte_ipv4_hdr *)&buf[temp_size];\n \t\t\tif (!vlan && !eth)\n \t\t\t\treturn rte_flow_error_set(error, EINVAL,\n \t\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION,\n@@ -1107,7 +1107,7 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,\n \t\t\t\tipv4->time_to_live = MLX5_ENCAP_IPV4_TTL_DEF;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_IPV6:\n-\t\t\tipv6 = (struct ipv6_hdr *)&buf[temp_size];\n+\t\t\tipv6 = (struct rte_ipv6_hdr *)&buf[temp_size];\n \t\t\tif (!vlan && !eth)\n \t\t\t\treturn rte_flow_error_set(error, EINVAL,\n \t\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION,\ndiff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c\nindex 595c13e1f..dd5a090af 100644\n--- a/drivers/net/mlx5/mlx5_flow_tcf.c\n+++ b/drivers/net/mlx5/mlx5_flow_tcf.c\n@@ -732,12 +732,12 @@ flow_tcf_pedit_key_set_dec_ttl(const struct rte_flow_action *actions,\n \tif (item_flags & MLX5_FLOW_LAYER_OUTER_L3_IPV4) {\n \t\tp_parser->keys_ex[idx].htype = TCA_PEDIT_KEY_EX_HDR_TYPE_IP4;\n \t\tp_parser->keys[idx].off =\n-\t\t\toffsetof(struct ipv4_hdr, time_to_live);\n+\t\t\toffsetof(struct rte_ipv4_hdr, time_to_live);\n \t}\n \tif (item_flags & MLX5_FLOW_LAYER_OUTER_L3_IPV6) {\n \t\tp_parser->keys_ex[idx].htype = TCA_PEDIT_KEY_EX_HDR_TYPE_IP6;\n \t\tp_parser->keys[idx].off =\n-\t\t\toffsetof(struct ipv6_hdr, hop_limits);\n+\t\t\toffsetof(struct rte_ipv6_hdr, hop_limits);\n \t}\n \tif (actions->type == RTE_FLOW_ACTION_TYPE_DEC_TTL) {\n \t\tp_parser->keys_ex[idx].cmd = TCA_PEDIT_KEY_EX_CMD_ADD;\n@@ -801,8 +801,8 @@ flow_tcf_pedit_key_set_ipv6_addr(const struct rte_flow_action *actions,\n \tint keys = NUM_OF_PEDIT_KEYS(IPV6_ADDR_LEN);\n \tint off_base =\n \t\tactions->type == RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC ?\n-\t\toffsetof(struct ipv6_hdr, src_addr) :\n-\t\toffsetof(struct ipv6_hdr, dst_addr);\n+\t\toffsetof(struct rte_ipv6_hdr, src_addr) :\n+\t\toffsetof(struct rte_ipv6_hdr, dst_addr);\n \tconst struct rte_flow_action_set_ipv6 *conf =\n \t\t(const struct rte_flow_action_set_ipv6 *)actions->conf;\n \n@@ -836,8 +836,8 @@ flow_tcf_pedit_key_set_ipv4_addr(const struct rte_flow_action *actions,\n \tp_parser->keys_ex[idx].cmd = TCA_PEDIT_KEY_EX_CMD_SET;\n \tp_parser->keys[idx].off =\n \t\tactions->type == RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC ?\n-\t\toffsetof(struct ipv4_hdr, src_addr) :\n-\t\toffsetof(struct ipv4_hdr, dst_addr);\n+\t\toffsetof(struct rte_ipv4_hdr, src_addr) :\n+\t\toffsetof(struct rte_ipv4_hdr, dst_addr);\n \tp_parser->keys[idx].mask = ~UINT32_MAX;\n \tp_parser->keys[idx].val =\n \t\t((const struct rte_flow_action_set_ipv4 *)\ndiff --git a/drivers/net/mvpp2/mrvl_flow.c b/drivers/net/mvpp2/mrvl_flow.c\nindex 738986575..381b54e29 100644\n--- a/drivers/net/mvpp2/mrvl_flow.c\n+++ b/drivers/net/mvpp2/mrvl_flow.c\n@@ -1170,7 +1170,7 @@ mrvl_parse_ip6(const struct rte_flow_item *item,\n \t       struct rte_flow_error *error)\n {\n \tconst struct rte_flow_item_ipv6 *spec = NULL, *mask = NULL;\n-\tstruct ipv6_hdr zero;\n+\tstruct rte_ipv6_hdr zero;\n \tuint32_t flow_mask;\n \tint ret;\n \ndiff --git a/drivers/net/qede/qede_filter.c b/drivers/net/qede/qede_filter.c\nindex 12c83f46d..34299b993 100644\n--- a/drivers/net/qede/qede_filter.c\n+++ b/drivers/net/qede/qede_filter.c\n@@ -457,8 +457,8 @@ qede_arfs_construct_pkt(struct rte_eth_dev *eth_dev,\n \tstruct ecore_dev *edev = QEDE_INIT_EDEV(qdev);\n \tuint16_t *ether_type;\n \tuint8_t *raw_pkt;\n-\tstruct ipv4_hdr *ip;\n-\tstruct ipv6_hdr *ip6;\n+\tstruct rte_ipv4_hdr *ip;\n+\tstruct rte_ipv6_hdr *ip6;\n \tstruct udp_hdr *udp;\n \tstruct tcp_hdr *tcp;\n \tuint16_t len;\n@@ -474,14 +474,14 @@ qede_arfs_construct_pkt(struct rte_eth_dev *eth_dev,\n \t*ether_type = rte_cpu_to_be_16(arfs->tuple.eth_proto);\n \tswitch (arfs->tuple.eth_proto) {\n \tcase RTE_ETHER_TYPE_IPv4:\n-\t\tip = (struct ipv4_hdr *)raw_pkt;\n+\t\tip = (struct rte_ipv4_hdr *)raw_pkt;\n \t\tip->version_ihl = QEDE_FDIR_IP_DEFAULT_VERSION_IHL;\n-\t\tip->total_length = sizeof(struct ipv4_hdr);\n+\t\tip->total_length = sizeof(struct rte_ipv4_hdr);\n \t\tip->next_proto_id = arfs->tuple.ip_proto;\n \t\tip->time_to_live = QEDE_FDIR_IPV4_DEF_TTL;\n \t\tip->dst_addr = arfs->tuple.dst_ipv4;\n \t\tip->src_addr = arfs->tuple.src_ipv4;\n-\t\tlen += sizeof(struct ipv4_hdr);\n+\t\tlen += sizeof(struct rte_ipv4_hdr);\n \t\tparams->ipv4 = true;\n \n \t\traw_pkt = (uint8_t *)buff;\n@@ -507,7 +507,7 @@ qede_arfs_construct_pkt(struct rte_eth_dev *eth_dev,\n \t\t}\n \t\tbreak;\n \tcase RTE_ETHER_TYPE_IPv6:\n-\t\tip6 = (struct ipv6_hdr *)raw_pkt;\n+\t\tip6 = (struct rte_ipv6_hdr *)raw_pkt;\n \t\tip6->proto = arfs->tuple.ip_proto;\n \t\tip6->vtc_flow =\n \t\t\trte_cpu_to_be_32(QEDE_FDIR_IPV6_DEFAULT_VTC_FLOW);\n@@ -516,7 +516,7 @@ qede_arfs_construct_pkt(struct rte_eth_dev *eth_dev,\n \t\t\t   IPV6_ADDR_LEN);\n \t\trte_memcpy(&ip6->dst_addr, arfs->tuple.dst_ipv6,\n \t\t\t   IPV6_ADDR_LEN);\n-\t\tlen += sizeof(struct ipv6_hdr);\n+\t\tlen += sizeof(struct rte_ipv6_hdr);\n \t\tparams->ipv6 = true;\n \n \t\traw_pkt = (uint8_t *)buff;\ndiff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c\nindex 235f78ae3..a07700167 100644\n--- a/drivers/net/qede/qede_rxtx.c\n+++ b/drivers/net/qede/qede_rxtx.c\n@@ -951,8 +951,8 @@ static inline uint32_t qede_rx_cqe_to_pkt_type_outer(struct rte_mbuf *m)\n {\n \tuint32_t packet_type = RTE_PTYPE_UNKNOWN;\n \tstruct rte_ether_hdr *eth_hdr;\n-\tstruct ipv4_hdr *ipv4_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \tstruct rte_vlan_hdr *vlan_hdr;\n \tuint16_t ethertype;\n \tbool vlan_tagged = 0;\n@@ -972,14 +972,14 @@ static inline uint32_t qede_rx_cqe_to_pkt_type_outer(struct rte_mbuf *m)\n \n \tif (ethertype == RTE_ETHER_TYPE_IPv4) {\n \t\tpacket_type |= RTE_PTYPE_L3_IPV4;\n-\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *, len);\n+\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *, len);\n \t\tif (ipv4_hdr->next_proto_id == IPPROTO_TCP)\n \t\t\tpacket_type |= RTE_PTYPE_L4_TCP;\n \t\telse if (ipv4_hdr->next_proto_id == IPPROTO_UDP)\n \t\t\tpacket_type |= RTE_PTYPE_L4_UDP;\n \t} else if (ethertype == RTE_ETHER_TYPE_IPv6) {\n \t\tpacket_type |= RTE_PTYPE_L3_IPV6;\n-\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct ipv6_hdr *, len);\n+\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv6_hdr *, len);\n \t\tif (ipv6_hdr->proto == IPPROTO_TCP)\n \t\t\tpacket_type |= RTE_PTYPE_L4_TCP;\n \t\telse if (ipv6_hdr->proto == IPPROTO_UDP)\n@@ -1141,7 +1141,7 @@ static inline uint32_t qede_rx_cqe_to_pkt_type(uint16_t flags)\n static inline uint8_t\n qede_check_notunn_csum_l3(struct rte_mbuf *m, uint16_t flag)\n {\n-\tstruct ipv4_hdr *ip;\n+\tstruct rte_ipv4_hdr *ip;\n \tuint16_t pkt_csum;\n \tuint16_t calc_csum;\n \tuint16_t val;\n@@ -1152,7 +1152,7 @@ qede_check_notunn_csum_l3(struct rte_mbuf *m, uint16_t flag)\n \tif (unlikely(val)) {\n \t\tm->packet_type = qede_rx_cqe_to_pkt_type(flag);\n \t\tif (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {\n-\t\t\tip = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,\n+\t\t\tip = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *,\n \t\t\t\t\t   sizeof(struct rte_ether_hdr));\n \t\t\tpkt_csum = ip->hdr_checksum;\n \t\t\tip->hdr_checksum = 0;\ndiff --git a/drivers/net/sfc/sfc_tso.h b/drivers/net/sfc/sfc_tso.h\nindex 8ecefdfd2..ef257519a 100644\n--- a/drivers/net/sfc/sfc_tso.h\n+++ b/drivers/net/sfc/sfc_tso.h\n@@ -29,10 +29,10 @@ extern \"C\" {\n static inline uint16_t\n sfc_tso_ip4_get_ipid(const uint8_t *pkt_hdrp, size_t ip_hdr_off)\n {\n-\tconst struct ipv4_hdr *ip_hdrp;\n+\tconst struct rte_ipv4_hdr *ip_hdrp;\n \tuint16_t ipid;\n \n-\tip_hdrp = (const struct ipv4_hdr *)(pkt_hdrp + ip_hdr_off);\n+\tip_hdrp = (const struct rte_ipv4_hdr *)(pkt_hdrp + ip_hdr_off);\n \trte_memcpy(&ipid, &ip_hdrp->packet_id, sizeof(ipid));\n \n \treturn rte_be_to_cpu_16(ipid);\ndiff --git a/drivers/net/softnic/rte_eth_softnic_pipeline.c b/drivers/net/softnic/rte_eth_softnic_pipeline.c\nindex 308fd1534..e0e5856a4 100644\n--- a/drivers/net/softnic/rte_eth_softnic_pipeline.c\n+++ b/drivers/net/softnic/rte_eth_softnic_pipeline.c\n@@ -660,7 +660,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {\n \t\t.size = sizeof(uint8_t),\n \t\t.field_index = 0,\n \t\t.input_index = 0,\n-\t\t.offset = offsetof(struct ipv4_hdr, next_proto_id),\n+\t\t.offset = offsetof(struct rte_ipv4_hdr, next_proto_id),\n \t},\n \n \t/* Source IP address (IPv4) */\n@@ -669,7 +669,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 1,\n \t\t.input_index = 1,\n-\t\t.offset = offsetof(struct ipv4_hdr, src_addr),\n+\t\t.offset = offsetof(struct rte_ipv4_hdr, src_addr),\n \t},\n \n \t/* Destination IP address (IPv4) */\n@@ -678,7 +678,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 2,\n \t\t.input_index = 2,\n-\t\t.offset = offsetof(struct ipv4_hdr, dst_addr),\n+\t\t.offset = offsetof(struct rte_ipv4_hdr, dst_addr),\n \t},\n \n \t/* Source Port */\n@@ -687,7 +687,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = 3,\n \t\t.input_index = 3,\n-\t\t.offset = sizeof(struct ipv4_hdr) +\n+\t\t.offset = sizeof(struct rte_ipv4_hdr) +\n \t\t\toffsetof(struct tcp_hdr, src_port),\n \t},\n \n@@ -697,7 +697,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = 4,\n \t\t.input_index = 3,\n-\t\t.offset = sizeof(struct ipv4_hdr) +\n+\t\t.offset = sizeof(struct rte_ipv4_hdr) +\n \t\t\toffsetof(struct tcp_hdr, dst_port),\n \t},\n };\n@@ -709,7 +709,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint8_t),\n \t\t.field_index = 0,\n \t\t.input_index = 0,\n-\t\t.offset = offsetof(struct ipv6_hdr, proto),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, proto),\n \t},\n \n \t/* Source IP address (IPv6) */\n@@ -718,7 +718,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 1,\n \t\t.input_index = 1,\n-\t\t.offset = offsetof(struct ipv6_hdr, src_addr[0]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, src_addr[0]),\n \t},\n \n \t[2] = {\n@@ -726,7 +726,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 2,\n \t\t.input_index = 2,\n-\t\t.offset = offsetof(struct ipv6_hdr, src_addr[4]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, src_addr[4]),\n \t},\n \n \t[3] = {\n@@ -734,7 +734,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 3,\n \t\t.input_index = 3,\n-\t\t.offset = offsetof(struct ipv6_hdr, src_addr[8]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, src_addr[8]),\n \t},\n \n \t[4] = {\n@@ -742,7 +742,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 4,\n \t\t.input_index = 4,\n-\t\t.offset = offsetof(struct ipv6_hdr, src_addr[12]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, src_addr[12]),\n \t},\n \n \t/* Destination IP address (IPv6) */\n@@ -751,7 +751,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 5,\n \t\t.input_index = 5,\n-\t\t.offset = offsetof(struct ipv6_hdr, dst_addr[0]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, dst_addr[0]),\n \t},\n \n \t[6] = {\n@@ -759,7 +759,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 6,\n \t\t.input_index = 6,\n-\t\t.offset = offsetof(struct ipv6_hdr, dst_addr[4]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, dst_addr[4]),\n \t},\n \n \t[7] = {\n@@ -767,7 +767,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 7,\n \t\t.input_index = 7,\n-\t\t.offset = offsetof(struct ipv6_hdr, dst_addr[8]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, dst_addr[8]),\n \t},\n \n \t[8] = {\n@@ -775,7 +775,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 8,\n \t\t.input_index = 8,\n-\t\t.offset = offsetof(struct ipv6_hdr, dst_addr[12]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, dst_addr[12]),\n \t},\n \n \t/* Source Port */\n@@ -784,7 +784,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = 9,\n \t\t.input_index = 9,\n-\t\t.offset = sizeof(struct ipv6_hdr) +\n+\t\t.offset = sizeof(struct rte_ipv6_hdr) +\n \t\t\toffsetof(struct tcp_hdr, src_port),\n \t},\n \n@@ -794,7 +794,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = 10,\n \t\t.input_index = 9,\n-\t\t.offset = sizeof(struct ipv6_hdr) +\n+\t\t.offset = sizeof(struct rte_ipv6_hdr) +\n \t\t\toffsetof(struct tcp_hdr, dst_port),\n \t},\n };\ndiff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c\nindex bb0aee42d..2465d9c2c 100644\n--- a/drivers/net/tap/rte_eth_tap.c\n+++ b/drivers/net/tap/rte_eth_tap.c\n@@ -272,12 +272,12 @@ tap_verify_csum(struct rte_mbuf *mbuf)\n \telse if (l2 == RTE_PTYPE_L2_ETHER_QINQ)\n \t\tl2_len += 8;\n \t/* Don't verify checksum for packets with discontinuous L2 header */\n-\tif (unlikely(l2_len + sizeof(struct ipv4_hdr) >\n+\tif (unlikely(l2_len + sizeof(struct rte_ipv4_hdr) >\n \t\t     rte_pktmbuf_data_len(mbuf)))\n \t\treturn;\n \tl3_hdr = rte_pktmbuf_mtod_offset(mbuf, void *, l2_len);\n \tif (l3 == RTE_PTYPE_L3_IPV4 || l3 == RTE_PTYPE_L3_IPV4_EXT) {\n-\t\tstruct ipv4_hdr *iph = l3_hdr;\n+\t\tstruct rte_ipv4_hdr *iph = l3_hdr;\n \n \t\t/* ihl contains the number of 4-byte words in the header */\n \t\tl3_len = 4 * (iph->version_ihl & 0xf);\n@@ -295,9 +295,9 @@ tap_verify_csum(struct rte_mbuf *mbuf)\n \t\t\tPKT_RX_IP_CKSUM_BAD :\n \t\t\tPKT_RX_IP_CKSUM_GOOD;\n \t} else if (l3 == RTE_PTYPE_L3_IPV6) {\n-\t\tstruct ipv6_hdr *iph = l3_hdr;\n+\t\tstruct rte_ipv6_hdr *iph = l3_hdr;\n \n-\t\tl3_len = sizeof(struct ipv6_hdr);\n+\t\tl3_len = sizeof(struct rte_ipv6_hdr);\n \t\t/* check that the total length reported by header is not\n \t\t * greater than the total received size\n \t\t */\n@@ -496,7 +496,7 @@ tap_tx_l3_cksum(char *packet, uint64_t ol_flags, unsigned int l2_len,\n \tvoid *l3_hdr = packet + l2_len;\n \n \tif (ol_flags & (PKT_TX_IP_CKSUM | PKT_TX_IPV4)) {\n-\t\tstruct ipv4_hdr *iph = l3_hdr;\n+\t\tstruct rte_ipv4_hdr *iph = l3_hdr;\n \t\tuint16_t cksum;\n \n \t\tiph->hdr_checksum = 0;\ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex 12283cd4c..2b1080155 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -479,13 +479,13 @@ virtio_tso_fix_cksum(struct rte_mbuf *m)\n \t/* common case: header is not fragmented */\n \tif (likely(rte_pktmbuf_data_len(m) >= m->l2_len + m->l3_len +\n \t\t\tm->l4_len)) {\n-\t\tstruct ipv4_hdr *iph;\n-\t\tstruct ipv6_hdr *ip6h;\n+\t\tstruct rte_ipv4_hdr *iph;\n+\t\tstruct rte_ipv6_hdr *ip6h;\n \t\tstruct tcp_hdr *th;\n \t\tuint16_t prev_cksum, new_cksum, ip_len, ip_paylen;\n \t\tuint32_t tmp;\n \n-\t\tiph = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *, m->l2_len);\n+\t\tiph = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *, m->l2_len);\n \t\tth = RTE_PTR_ADD(iph, m->l3_len);\n \t\tif ((iph->version_ihl >> 4) == 4) {\n \t\t\tiph->hdr_checksum = 0;\n@@ -494,7 +494,7 @@ virtio_tso_fix_cksum(struct rte_mbuf *m)\n \t\t\tip_paylen = rte_cpu_to_be_16(rte_be_to_cpu_16(ip_len) -\n \t\t\t\tm->l3_len);\n \t\t} else {\n-\t\t\tip6h = (struct ipv6_hdr *)iph;\n+\t\t\tip6h = (struct rte_ipv6_hdr *)iph;\n \t\t\tip_paylen = ip6h->payload_len;\n \t\t}\n \ndiff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c\nindex a2c047ec6..7749458e4 100644\n--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c\n+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c\n@@ -667,8 +667,8 @@ vmxnet3_guess_mss(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd,\n \t\tstruct rte_mbuf *rxm)\n {\n \tuint32_t hlen, slen;\n-\tstruct ipv4_hdr *ipv4_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \tstruct tcp_hdr *tcp_hdr;\n \tchar *ptr;\n \n@@ -679,20 +679,20 @@ vmxnet3_guess_mss(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd,\n \thlen = sizeof(struct rte_ether_hdr);\n \n \tif (rcd->v4) {\n-\t\tif (unlikely(slen < hlen + sizeof(struct ipv4_hdr)))\n-\t\t\treturn hw->mtu - sizeof(struct ipv4_hdr)\n+\t\tif (unlikely(slen < hlen + sizeof(struct rte_ipv4_hdr)))\n+\t\t\treturn hw->mtu - sizeof(struct rte_ipv4_hdr)\n \t\t\t\t\t- sizeof(struct tcp_hdr);\n \n-\t\tipv4_hdr = (struct ipv4_hdr *)(ptr + hlen);\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} else if (rcd->v6) {\n-\t\tif (unlikely(slen < hlen + sizeof(struct ipv6_hdr)))\n-\t\t\treturn hw->mtu - sizeof(struct ipv6_hdr) -\n+\t\tif (unlikely(slen < hlen + sizeof(struct rte_ipv6_hdr)))\n+\t\t\treturn hw->mtu - sizeof(struct rte_ipv6_hdr) -\n \t\t\t\t\tsizeof(struct tcp_hdr);\n \n-\t\tipv6_hdr = (struct ipv6_hdr *)(ptr + hlen);\n-\t\thlen += sizeof(struct ipv6_hdr);\n+\t\tipv6_hdr = (struct rte_ipv6_hdr *)(ptr + hlen);\n+\t\thlen += sizeof(struct rte_ipv6_hdr);\n \t\tif (unlikely(ipv6_hdr->proto != IPPROTO_TCP)) {\n \t\t\tint frag;\n \ndiff --git a/examples/bond/main.c b/examples/bond/main.c\nindex 04102b7ed..cea37e02c 100644\n--- a/examples/bond/main.c\n+++ b/examples/bond/main.c\n@@ -340,7 +340,7 @@ static int lcore_main(__attribute__((unused)) void *arg1)\n \n \tstruct rte_ether_hdr *eth_hdr;\n \tstruct rte_arp_hdr *arp_hdr;\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tuint16_t ether_type, offset;\n \n \tuint16_t rx_cnt;\n@@ -405,7 +405,7 @@ static int lcore_main(__attribute__((unused)) void *arg1)\n \t\t\t\t\tglobal_flag_stru_p->port_packets[2]++;\n \t\t\t\t\trte_spinlock_unlock(&global_flag_stru_p->lock);\n \t\t\t\t }\n-\t\t\t\tipv4_hdr = (struct ipv4_hdr *)((char *)(eth_hdr + 1) + offset);\n+\t\t\t\tipv4_hdr = (struct rte_ipv4_hdr *)((char *)(eth_hdr + 1) + offset);\n \t\t\t\tif (ipv4_hdr->dst_addr == bond_ip) {\n \t\t\t\t\trte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);\n \t\t\t\t\trte_eth_macaddr_get(BOND_PORT, &eth_hdr->s_addr);\ndiff --git a/examples/flow_classify/flow_classify.c b/examples/flow_classify/flow_classify.c\nindex dfb7db1c9..c75a410f4 100644\n--- a/examples/flow_classify/flow_classify.c\n+++ b/examples/flow_classify/flow_classify.c\n@@ -99,7 +99,7 @@ static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {\n \t\t.field_index = PROTO_FIELD_IPV4,\n \t\t.input_index = PROTO_INPUT_IPV4,\n \t\t.offset = sizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, next_proto_id),\n+\t\t\toffsetof(struct rte_ipv4_hdr, next_proto_id),\n \t},\n \t/* next input field (IPv4 source address) - 4 consecutive bytes. */\n \t{\n@@ -109,7 +109,7 @@ static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {\n \t\t.field_index = SRC_FIELD_IPV4,\n \t\t.input_index = SRC_INPUT_IPV4,\n \t\t.offset = sizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, src_addr),\n+\t\t\toffsetof(struct rte_ipv4_hdr, src_addr),\n \t},\n \t/* next input field (IPv4 destination address) - 4 consecutive bytes. */\n \t{\n@@ -119,7 +119,7 @@ static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {\n \t\t.field_index = DST_FIELD_IPV4,\n \t\t.input_index = DST_INPUT_IPV4,\n \t\t.offset = sizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, dst_addr),\n+\t\t\toffsetof(struct rte_ipv4_hdr, dst_addr),\n \t},\n \t/*\n \t * Next 2 fields (src & dst ports) form 4 consecutive bytes.\n@@ -132,7 +132,7 @@ static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {\n \t\t.field_index = SRCP_FIELD_IPV4,\n \t\t.input_index = SRCP_DESTP_INPUT_IPV4,\n \t\t.offset = sizeof(struct rte_ether_hdr) +\n-\t\t\tsizeof(struct ipv4_hdr) +\n+\t\t\tsizeof(struct rte_ipv4_hdr) +\n \t\t\toffsetof(struct tcp_hdr, src_port),\n \t},\n \t{\n@@ -142,7 +142,7 @@ static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {\n \t\t.field_index = DSTP_FIELD_IPV4,\n \t\t.input_index = SRCP_DESTP_INPUT_IPV4,\n \t\t.offset = sizeof(struct rte_ether_hdr) +\n-\t\t\tsizeof(struct ipv4_hdr) +\n+\t\t\tsizeof(struct rte_ipv4_hdr) +\n \t\t\toffsetof(struct tcp_hdr, dst_port),\n \t},\n };\ndiff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c\nindex b34a2228f..9c8a0a9b9 100644\n--- a/examples/ip_fragmentation/main.c\n+++ b/examples/ip_fragmentation/main.c\n@@ -65,8 +65,8 @@\n /*\n  * Default payload in bytes for the IPv6 packet.\n  */\n-#define\tIPV4_DEFAULT_PAYLOAD\t(IPV4_MTU_DEFAULT - sizeof(struct ipv4_hdr))\n-#define\tIPV6_DEFAULT_PAYLOAD\t(IPV6_MTU_DEFAULT - sizeof(struct ipv6_hdr))\n+#define\tIPV4_DEFAULT_PAYLOAD\t(IPV4_MTU_DEFAULT - sizeof(struct rte_ipv4_hdr))\n+#define\tIPV6_DEFAULT_PAYLOAD\t(IPV6_MTU_DEFAULT - sizeof(struct rte_ipv6_hdr))\n \n /*\n  * Max number of fragments per packet expected - defined by config file.\n@@ -259,10 +259,10 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,\n \n \t/* if this is an IPv4 packet */\n \tif (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {\n-\t\tstruct ipv4_hdr *ip_hdr;\n+\t\tstruct rte_ipv4_hdr *ip_hdr;\n \t\tuint32_t ip_dst;\n \t\t/* Read the lookup key (i.e. ip_dst) from the input packet */\n-\t\tip_hdr = rte_pktmbuf_mtod(m, struct ipv4_hdr *);\n+\t\tip_hdr = rte_pktmbuf_mtod(m, struct rte_ipv4_hdr *);\n \t\tip_dst = rte_be_to_cpu_32(ip_hdr->dst_addr);\n \n \t\t/* Find destination port */\n@@ -294,12 +294,12 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,\n \t\t}\n \t} else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {\n \t\t/* if this is an IPv6 packet */\n-\t\tstruct ipv6_hdr *ip_hdr;\n+\t\tstruct rte_ipv6_hdr *ip_hdr;\n \n \t\tipv6 = 1;\n \n \t\t/* Read the lookup key (i.e. ip_dst) from the input packet */\n-\t\tip_hdr = rte_pktmbuf_mtod(m, struct ipv6_hdr *);\n+\t\tip_hdr = rte_pktmbuf_mtod(m, struct rte_ipv6_hdr *);\n \n \t\t/* Find destination port */\n \t\tif (rte_lpm6_lookup(rxq->lpm6, ip_hdr->dst_addr,\ndiff --git a/examples/ip_pipeline/pipeline.c b/examples/ip_pipeline/pipeline.c\nindex 78d590d77..9cc7e32d8 100644\n--- a/examples/ip_pipeline/pipeline.c\n+++ b/examples/ip_pipeline/pipeline.c\n@@ -636,7 +636,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {\n \t\t.size = sizeof(uint8_t),\n \t\t.field_index = 0,\n \t\t.input_index = 0,\n-\t\t.offset = offsetof(struct ipv4_hdr, next_proto_id),\n+\t\t.offset = offsetof(struct rte_ipv4_hdr, next_proto_id),\n \t},\n \n \t/* Source IP address (IPv4) */\n@@ -645,7 +645,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 1,\n \t\t.input_index = 1,\n-\t\t.offset = offsetof(struct ipv4_hdr, src_addr),\n+\t\t.offset = offsetof(struct rte_ipv4_hdr, src_addr),\n \t},\n \n \t/* Destination IP address (IPv4) */\n@@ -654,7 +654,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 2,\n \t\t.input_index = 2,\n-\t\t.offset = offsetof(struct ipv4_hdr, dst_addr),\n+\t\t.offset = offsetof(struct rte_ipv4_hdr, dst_addr),\n \t},\n \n \t/* Source Port */\n@@ -663,7 +663,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = 3,\n \t\t.input_index = 3,\n-\t\t.offset = sizeof(struct ipv4_hdr) +\n+\t\t.offset = sizeof(struct rte_ipv4_hdr) +\n \t\t\toffsetof(struct tcp_hdr, src_port),\n \t},\n \n@@ -673,7 +673,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = 4,\n \t\t.input_index = 3,\n-\t\t.offset = sizeof(struct ipv4_hdr) +\n+\t\t.offset = sizeof(struct rte_ipv4_hdr) +\n \t\t\toffsetof(struct tcp_hdr, dst_port),\n \t},\n };\n@@ -685,7 +685,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint8_t),\n \t\t.field_index = 0,\n \t\t.input_index = 0,\n-\t\t.offset = offsetof(struct ipv6_hdr, proto),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, proto),\n \t},\n \n \t/* Source IP address (IPv6) */\n@@ -694,7 +694,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 1,\n \t\t.input_index = 1,\n-\t\t.offset = offsetof(struct ipv6_hdr, src_addr[0]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, src_addr[0]),\n \t},\n \n \t[2] = {\n@@ -702,7 +702,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 2,\n \t\t.input_index = 2,\n-\t\t.offset = offsetof(struct ipv6_hdr, src_addr[4]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, src_addr[4]),\n \t},\n \n \t[3] = {\n@@ -710,7 +710,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 3,\n \t\t.input_index = 3,\n-\t\t.offset = offsetof(struct ipv6_hdr, src_addr[8]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, src_addr[8]),\n \t},\n \n \t[4] = {\n@@ -718,7 +718,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 4,\n \t\t.input_index = 4,\n-\t\t.offset = offsetof(struct ipv6_hdr, src_addr[12]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, src_addr[12]),\n \t},\n \n \t/* Destination IP address (IPv6) */\n@@ -727,7 +727,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 5,\n \t\t.input_index = 5,\n-\t\t.offset = offsetof(struct ipv6_hdr, dst_addr[0]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, dst_addr[0]),\n \t},\n \n \t[6] = {\n@@ -735,7 +735,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 6,\n \t\t.input_index = 6,\n-\t\t.offset = offsetof(struct ipv6_hdr, dst_addr[4]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, dst_addr[4]),\n \t},\n \n \t[7] = {\n@@ -743,7 +743,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 7,\n \t\t.input_index = 7,\n-\t\t.offset = offsetof(struct ipv6_hdr, dst_addr[8]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, dst_addr[8]),\n \t},\n \n \t[8] = {\n@@ -751,7 +751,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = 8,\n \t\t.input_index = 8,\n-\t\t.offset = offsetof(struct ipv6_hdr, dst_addr[12]),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, dst_addr[12]),\n \t},\n \n \t/* Source Port */\n@@ -760,7 +760,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = 9,\n \t\t.input_index = 9,\n-\t\t.offset = sizeof(struct ipv6_hdr) +\n+\t\t.offset = sizeof(struct rte_ipv6_hdr) +\n \t\t\toffsetof(struct tcp_hdr, src_port),\n \t},\n \n@@ -770,7 +770,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = 10,\n \t\t.input_index = 9,\n-\t\t.offset = sizeof(struct ipv6_hdr) +\n+\t\t.offset = sizeof(struct rte_ipv6_hdr) +\n \t\t\toffsetof(struct tcp_hdr, dst_port),\n \t},\n };\ndiff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c\nindex c2a1f9228..00a95e07a 100644\n--- a/examples/ip_reassembly/main.c\n+++ b/examples/ip_reassembly/main.c\n@@ -324,10 +324,10 @@ reassemble(struct rte_mbuf *m, uint16_t portid, uint32_t queue,\n \n \t/* if packet is IPv4 */\n \tif (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {\n-\t\tstruct ipv4_hdr *ip_hdr;\n+\t\tstruct rte_ipv4_hdr *ip_hdr;\n \t\tuint32_t ip_dst;\n \n-\t\tip_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\t\tip_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \n \t\t /* if it is a fragmented packet, then try to reassemble. */\n \t\tif (rte_ipv4_frag_pkt_is_fragmented(ip_hdr)) {\n@@ -351,7 +351,7 @@ reassemble(struct rte_mbuf *m, uint16_t portid, uint32_t queue,\n \t\t\t\tm = mo;\n \t\t\t\teth_hdr = rte_pktmbuf_mtod(m,\n \t\t\t\t\tstruct rte_ether_hdr *);\n-\t\t\t\tip_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\t\t\t\tip_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \t\t\t}\n \t\t}\n \t\tip_dst = rte_be_to_cpu_32(ip_hdr->dst_addr);\n@@ -366,9 +366,9 @@ reassemble(struct rte_mbuf *m, uint16_t portid, uint32_t queue,\n \t} else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {\n \t\t/* if packet is IPv6 */\n \t\tstruct ipv6_extension_fragment *frag_hdr;\n-\t\tstruct ipv6_hdr *ip_hdr;\n+\t\tstruct rte_ipv6_hdr *ip_hdr;\n \n-\t\tip_hdr = (struct ipv6_hdr *)(eth_hdr + 1);\n+\t\tip_hdr = (struct rte_ipv6_hdr *)(eth_hdr + 1);\n \n \t\tfrag_hdr = rte_ipv6_frag_get_ipv6_fragment_header(ip_hdr);\n \n@@ -389,7 +389,7 @@ reassemble(struct rte_mbuf *m, uint16_t portid, uint32_t queue,\n \t\t\tif (mo != m) {\n \t\t\t\tm = mo;\n \t\t\t\teth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);\n-\t\t\t\tip_hdr = (struct ipv6_hdr *)(eth_hdr + 1);\n+\t\t\t\tip_hdr = (struct rte_ipv6_hdr *)(eth_hdr + 1);\n \t\t\t}\n \t\t}\n \ndiff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c\nindex 05c187c4c..3302ce944 100644\n--- a/examples/ipsec-secgw/ipsec-secgw.c\n+++ b/examples/ipsec-secgw/ipsec-secgw.c\n@@ -340,7 +340,7 @@ prepare_tx_pkt(struct rte_mbuf *pkt, uint16_t port,\n \n \t\t/* calculate IPv4 cksum in SW */\n \t\tif ((pkt->ol_flags & PKT_TX_IP_CKSUM) == 0)\n-\t\t\tip->ip_sum = rte_ipv4_cksum((struct ipv4_hdr *)ip);\n+\t\t\tip->ip_sum = rte_ipv4_cksum((struct rte_ipv4_hdr *)ip);\n \n \t\tethhdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4);\n \t} else {\ndiff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c\nindex b323b0163..1d0020567 100644\n--- a/examples/ipsec-secgw/sa.c\n+++ b/examples/ipsec-secgw/sa.c\n@@ -967,7 +967,7 @@ get_spi_proto(uint32_t spi, enum rte_security_ipsec_sa_direction dir)\n \n static int\n fill_ipsec_sa_prm(struct rte_ipsec_sa_prm *prm, const struct ipsec_sa *ss,\n-\tconst struct ipv4_hdr *v4, struct ipv6_hdr *v6)\n+\tconst struct rte_ipv4_hdr *v4, struct rte_ipv6_hdr *v6)\n {\n \tint32_t rc;\n \n@@ -1038,7 +1038,7 @@ ipsec_sa_init(struct ipsec_sa *lsa, struct rte_ipsec_sa *sa, uint32_t sa_size)\n {\n \tint rc;\n \tstruct rte_ipsec_sa_prm prm;\n-\tstruct ipv4_hdr v4  = {\n+\tstruct rte_ipv4_hdr v4  = {\n \t\t.version_ihl = IPVERSION << 4 |\n \t\t\tsizeof(v4) / IPV4_IHL_MULTIPLIER,\n \t\t.time_to_live = IPDEFTTL,\n@@ -1046,7 +1046,7 @@ ipsec_sa_init(struct ipsec_sa *lsa, struct rte_ipsec_sa *sa, uint32_t sa_size)\n \t\t.src_addr = lsa->src.ip.ip4,\n \t\t.dst_addr = lsa->dst.ip.ip4,\n \t};\n-\tstruct ipv6_hdr v6 = {\n+\tstruct rte_ipv6_hdr v6 = {\n \t\t.vtc_flow = htonl(IP6_VERSION << 28),\n \t\t.proto = IPPROTO_ESP,\n \t};\ndiff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c\nindex cc9a30c4c..259c0d19e 100644\n--- a/examples/ipv4_multicast/main.c\n+++ b/examples/ipv4_multicast/main.c\n@@ -296,7 +296,7 @@ static inline void\n mcast_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf)\n {\n \tstruct rte_mbuf *mc;\n-\tstruct ipv4_hdr *iphdr;\n+\tstruct rte_ipv4_hdr *iphdr;\n \tuint32_t dest_addr, port_mask, port_num, use_clone;\n \tint32_t hash;\n \tuint16_t port;\n@@ -306,7 +306,7 @@ mcast_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf)\n \t} dst_eth_addr;\n \n \t/* Remove the Ethernet header from the input packet */\n-\tiphdr = (struct ipv4_hdr *)rte_pktmbuf_adj(m, (uint16_t)sizeof(struct rte_ether_hdr));\n+\tiphdr = (struct rte_ipv4_hdr *)rte_pktmbuf_adj(m, (uint16_t)sizeof(struct rte_ether_hdr));\n \tRTE_ASSERT(iphdr != NULL);\n \n \tdest_addr = rte_be_to_cpu_32(iphdr->dst_addr);\ndiff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c\nindex 973a371bf..06f5d1db1 100644\n--- a/examples/l2fwd-crypto/main.c\n+++ b/examples/l2fwd-crypto/main.c\n@@ -388,7 +388,7 @@ l2fwd_simple_crypto_enqueue(struct rte_mbuf *m,\n \t\tstruct l2fwd_crypto_params *cparams)\n {\n \tstruct rte_ether_hdr *eth_hdr;\n-\tstruct ipv4_hdr *ip_hdr;\n+\tstruct rte_ipv4_hdr *ip_hdr;\n \n \tuint32_t ipdata_offset, data_len;\n \tuint32_t pad_len = 0;\n@@ -401,7 +401,7 @@ l2fwd_simple_crypto_enqueue(struct rte_mbuf *m,\n \n \tipdata_offset = sizeof(struct rte_ether_hdr);\n \n-\tip_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m, char *) +\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)\ndiff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c\nindex ab8ba046b..b0e933e03 100644\n--- a/examples/l3fwd-acl/main.c\n+++ b/examples/l3fwd-acl/main.c\n@@ -146,7 +146,7 @@ static struct rte_mempool *pktmbuf_pool[NB_SOCKETS];\n /***********************start of ACL part******************************/\n #ifdef DO_RFC_1812_CHECKS\n static inline int\n-is_valid_ipv4_pkt(struct ipv4_hdr *pkt, uint32_t link_len);\n+is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len);\n #endif\n static inline void\n send_single_packet(struct rte_mbuf *m, uint16_t port);\n@@ -174,8 +174,8 @@ send_single_packet(struct rte_mbuf *m, uint16_t port);\n \t\t*d = (unsigned char)(ip & 0xff);\\\n \t} while (0)\n #define OFF_ETHHEAD\t(sizeof(struct rte_ether_hdr))\n-#define OFF_IPV42PROTO (offsetof(struct ipv4_hdr, next_proto_id))\n-#define OFF_IPV62PROTO (offsetof(struct ipv6_hdr, proto))\n+#define OFF_IPV42PROTO (offsetof(struct rte_ipv4_hdr, next_proto_id))\n+#define OFF_IPV62PROTO (offsetof(struct rte_ipv6_hdr, proto))\n #define MBUF_IPV4_2PROTO(m)\t\\\n \trte_pktmbuf_mtod_offset((m), uint8_t *, OFF_ETHHEAD + OFF_IPV42PROTO)\n #define MBUF_IPV6_2PROTO(m)\t\\\n@@ -252,32 +252,32 @@ struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = SRC_FIELD_IPV4,\n \t\t.input_index = RTE_ACL_IPV4VLAN_SRC,\n-\t\t.offset = offsetof(struct ipv4_hdr, src_addr) -\n-\t\t\toffsetof(struct ipv4_hdr, next_proto_id),\n+\t\t.offset = offsetof(struct rte_ipv4_hdr, src_addr) -\n+\t\t\toffsetof(struct rte_ipv4_hdr, next_proto_id),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_MASK,\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = DST_FIELD_IPV4,\n \t\t.input_index = RTE_ACL_IPV4VLAN_DST,\n-\t\t.offset = offsetof(struct ipv4_hdr, dst_addr) -\n-\t\t\toffsetof(struct ipv4_hdr, next_proto_id),\n+\t\t.offset = offsetof(struct rte_ipv4_hdr, dst_addr) -\n+\t\t\toffsetof(struct rte_ipv4_hdr, next_proto_id),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_RANGE,\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = SRCP_FIELD_IPV4,\n \t\t.input_index = RTE_ACL_IPV4VLAN_PORTS,\n-\t\t.offset = sizeof(struct ipv4_hdr) -\n-\t\t\toffsetof(struct ipv4_hdr, next_proto_id),\n+\t\t.offset = sizeof(struct rte_ipv4_hdr) -\n+\t\t\toffsetof(struct rte_ipv4_hdr, next_proto_id),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_RANGE,\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = DSTP_FIELD_IPV4,\n \t\t.input_index = RTE_ACL_IPV4VLAN_PORTS,\n-\t\t.offset = sizeof(struct ipv4_hdr) -\n-\t\t\toffsetof(struct ipv4_hdr, next_proto_id) +\n+\t\t.offset = sizeof(struct rte_ipv4_hdr) -\n+\t\t\toffsetof(struct rte_ipv4_hdr, next_proto_id) +\n \t\t\tsizeof(uint16_t),\n \t},\n };\n@@ -314,80 +314,80 @@ struct rte_acl_field_def ipv6_defs[NUM_FIELDS_IPV6] = {\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = SRC1_FIELD_IPV6,\n \t\t.input_index = SRC1_FIELD_IPV6,\n-\t\t.offset = offsetof(struct ipv6_hdr, src_addr) -\n-\t\t\toffsetof(struct ipv6_hdr, proto),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, src_addr) -\n+\t\t\toffsetof(struct rte_ipv6_hdr, proto),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_MASK,\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = SRC2_FIELD_IPV6,\n \t\t.input_index = SRC2_FIELD_IPV6,\n-\t\t.offset = offsetof(struct ipv6_hdr, src_addr) -\n-\t\t\toffsetof(struct ipv6_hdr, proto) + sizeof(uint32_t),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, src_addr) -\n+\t\t\toffsetof(struct rte_ipv6_hdr, proto) + sizeof(uint32_t),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_MASK,\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = SRC3_FIELD_IPV6,\n \t\t.input_index = SRC3_FIELD_IPV6,\n-\t\t.offset = offsetof(struct ipv6_hdr, src_addr) -\n-\t\t\toffsetof(struct ipv6_hdr, proto) + 2 * sizeof(uint32_t),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, src_addr) -\n+\t\t\toffsetof(struct rte_ipv6_hdr, proto) + 2 * sizeof(uint32_t),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_MASK,\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = SRC4_FIELD_IPV6,\n \t\t.input_index = SRC4_FIELD_IPV6,\n-\t\t.offset = offsetof(struct ipv6_hdr, src_addr) -\n-\t\t\toffsetof(struct ipv6_hdr, proto) + 3 * sizeof(uint32_t),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, src_addr) -\n+\t\t\toffsetof(struct rte_ipv6_hdr, proto) + 3 * sizeof(uint32_t),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_MASK,\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = DST1_FIELD_IPV6,\n \t\t.input_index = DST1_FIELD_IPV6,\n-\t\t.offset = offsetof(struct ipv6_hdr, dst_addr)\n-\t\t\t\t- offsetof(struct ipv6_hdr, proto),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, dst_addr)\n+\t\t\t\t- offsetof(struct rte_ipv6_hdr, proto),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_MASK,\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = DST2_FIELD_IPV6,\n \t\t.input_index = DST2_FIELD_IPV6,\n-\t\t.offset = offsetof(struct ipv6_hdr, dst_addr) -\n-\t\t\toffsetof(struct ipv6_hdr, proto) + sizeof(uint32_t),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, dst_addr) -\n+\t\t\toffsetof(struct rte_ipv6_hdr, proto) + sizeof(uint32_t),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_MASK,\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = DST3_FIELD_IPV6,\n \t\t.input_index = DST3_FIELD_IPV6,\n-\t\t.offset = offsetof(struct ipv6_hdr, dst_addr) -\n-\t\t\toffsetof(struct ipv6_hdr, proto) + 2 * sizeof(uint32_t),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, dst_addr) -\n+\t\t\toffsetof(struct rte_ipv6_hdr, proto) + 2 * sizeof(uint32_t),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_MASK,\n \t\t.size = sizeof(uint32_t),\n \t\t.field_index = DST4_FIELD_IPV6,\n \t\t.input_index = DST4_FIELD_IPV6,\n-\t\t.offset = offsetof(struct ipv6_hdr, dst_addr) -\n-\t\t\toffsetof(struct ipv6_hdr, proto) + 3 * sizeof(uint32_t),\n+\t\t.offset = offsetof(struct rte_ipv6_hdr, dst_addr) -\n+\t\t\toffsetof(struct rte_ipv6_hdr, proto) + 3 * sizeof(uint32_t),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_RANGE,\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = SRCP_FIELD_IPV6,\n \t\t.input_index = SRCP_FIELD_IPV6,\n-\t\t.offset = sizeof(struct ipv6_hdr) -\n-\t\t\toffsetof(struct ipv6_hdr, proto),\n+\t\t.offset = sizeof(struct rte_ipv6_hdr) -\n+\t\t\toffsetof(struct rte_ipv6_hdr, proto),\n \t},\n \t{\n \t\t.type = RTE_ACL_FIELD_TYPE_RANGE,\n \t\t.size = sizeof(uint16_t),\n \t\t.field_index = DSTP_FIELD_IPV6,\n \t\t.input_index = SRCP_FIELD_IPV6,\n-\t\t.offset = sizeof(struct ipv6_hdr) -\n-\t\t\toffsetof(struct ipv6_hdr, proto) + sizeof(uint16_t),\n+\t\t.offset = sizeof(struct rte_ipv6_hdr) -\n+\t\t\toffsetof(struct rte_ipv6_hdr, proto) + sizeof(uint16_t),\n \t},\n };\n \n@@ -542,8 +542,8 @@ dump_acl4_rule(struct rte_mbuf *m, uint32_t sig)\n {\n \tuint32_t offset = sig & ~ACL_DENY_SIGNATURE;\n \tunsigned char a, b, c, d;\n-\tstruct ipv4_hdr *ipv4_hdr = rte_pktmbuf_mtod_offset(m,\n-\t\t\t\t\t\t\t    struct ipv4_hdr *,\n+\tstruct rte_ipv4_hdr *ipv4_hdr = rte_pktmbuf_mtod_offset(m,\n+\t\t\t\t\t\t\t    struct rte_ipv4_hdr *,\n \t\t\t\t\t\t\t    sizeof(struct rte_ether_hdr));\n \n \tuint32_t_to_char(rte_bswap32(ipv4_hdr->src_addr), &a, &b, &c, &d);\n@@ -566,8 +566,8 @@ dump_acl6_rule(struct rte_mbuf *m, uint32_t sig)\n {\n \tunsigned i;\n \tuint32_t offset = sig & ~ACL_DENY_SIGNATURE;\n-\tstruct ipv6_hdr *ipv6_hdr = rte_pktmbuf_mtod_offset(m,\n-\t\t\t\t\t\t\t    struct ipv6_hdr *,\n+\tstruct rte_ipv6_hdr *ipv6_hdr = rte_pktmbuf_mtod_offset(m,\n+\t\t\t\t\t\t\t    struct rte_ipv6_hdr *,\n \t\t\t\t\t\t\t    sizeof(struct rte_ether_hdr));\n \n \tprintf(\"Packet Src\");\n@@ -620,11 +620,11 @@ static inline void\n prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,\n \tint index)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tstruct rte_mbuf *pkt = pkts_in[index];\n \n \tif (RTE_ETH_IS_IPV4_HDR(pkt->packet_type)) {\n-\t\tipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct ipv4_hdr *,\n+\t\tipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,\n \t\t\t\t\t\t   sizeof(struct rte_ether_hdr));\n \n \t\t/* Check to make sure the packet is valid (RFC1812) */\n@@ -1281,14 +1281,14 @@ send_single_packet(struct rte_mbuf *m, uint16_t port)\n \n #ifdef DO_RFC_1812_CHECKS\n static inline int\n-is_valid_ipv4_pkt(struct ipv4_hdr *pkt, uint32_t link_len)\n+is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)\n {\n \t/* From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2 */\n \t/*\n \t * 1. The packet length reported by the Link Layer must be large\n \t * enough to hold the minimum length legal IP datagram (20 bytes).\n \t */\n-\tif (link_len < sizeof(struct ipv4_hdr))\n+\tif (link_len < sizeof(struct rte_ipv4_hdr))\n \t\treturn -1;\n \n \t/* 2. The IP checksum must be correct. */\n@@ -1313,7 +1313,7 @@ is_valid_ipv4_pkt(struct ipv4_hdr *pkt, uint32_t link_len)\n \t * datagram header, whose length is specified in the IP header length\n \t * field.\n \t */\n-\tif (rte_cpu_to_be_16(pkt->total_length) < sizeof(struct ipv4_hdr))\n+\tif (rte_cpu_to_be_16(pkt->total_length) < sizeof(struct rte_ipv4_hdr))\n \t\treturn -5;\n \n \treturn 0;\ndiff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c\nindex 2725bb40b..91f144605 100644\n--- a/examples/l3fwd-power/main.c\n+++ b/examples/l3fwd-power/main.c\n@@ -466,14 +466,14 @@ send_single_packet(struct rte_mbuf *m, uint16_t port)\n \n #ifdef DO_RFC_1812_CHECKS\n static inline int\n-is_valid_ipv4_pkt(struct ipv4_hdr *pkt, uint32_t link_len)\n+is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)\n {\n \t/* From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2 */\n \t/*\n \t * 1. The packet length reported by the Link Layer must be large\n \t * enough to hold the minimum length legal IP datagram (20 bytes).\n \t */\n-\tif (link_len < sizeof(struct ipv4_hdr))\n+\tif (link_len < sizeof(struct rte_ipv4_hdr))\n \t\treturn -1;\n \n \t/* 2. The IP checksum must be correct. */\n@@ -498,7 +498,7 @@ is_valid_ipv4_pkt(struct ipv4_hdr *pkt, uint32_t link_len)\n \t * datagram header, whose length is specified in the IP header length\n \t * field.\n \t */\n-\tif (rte_cpu_to_be_16(pkt->total_length) < sizeof(struct ipv4_hdr))\n+\tif (rte_cpu_to_be_16(pkt->total_length) < sizeof(struct rte_ipv4_hdr))\n \t\treturn -5;\n \n \treturn 0;\n@@ -523,7 +523,7 @@ print_ipv6_key(struct ipv6_5tuple key)\n }\n \n static inline uint16_t\n-get_ipv4_dst_port(struct ipv4_hdr *ipv4_hdr, uint16_t portid,\n+get_ipv4_dst_port(struct rte_ipv4_hdr *ipv4_hdr, uint16_t portid,\n \t\tlookup_struct_t * ipv4_l3fwd_lookup_struct)\n {\n \tstruct ipv4_5tuple key;\n@@ -538,14 +538,14 @@ get_ipv4_dst_port(struct ipv4_hdr *ipv4_hdr, uint16_t portid,\n \tswitch (ipv4_hdr->next_proto_id) {\n \tcase IPPROTO_TCP:\n \t\ttcp = (struct tcp_hdr *)((unsigned char *)ipv4_hdr +\n-\t\t\t\t\tsizeof(struct ipv4_hdr));\n+\t\t\t\t\tsizeof(struct rte_ipv4_hdr));\n \t\tkey.port_dst = rte_be_to_cpu_16(tcp->dst_port);\n \t\tkey.port_src = rte_be_to_cpu_16(tcp->src_port);\n \t\tbreak;\n \n \tcase IPPROTO_UDP:\n \t\tudp = (struct udp_hdr *)((unsigned char *)ipv4_hdr +\n-\t\t\t\t\tsizeof(struct ipv4_hdr));\n+\t\t\t\t\tsizeof(struct rte_ipv4_hdr));\n \t\tkey.port_dst = rte_be_to_cpu_16(udp->dst_port);\n \t\tkey.port_src = rte_be_to_cpu_16(udp->src_port);\n \t\tbreak;\n@@ -562,7 +562,7 @@ get_ipv4_dst_port(struct ipv4_hdr *ipv4_hdr, uint16_t portid,\n }\n \n static inline uint16_t\n-get_ipv6_dst_port(struct ipv6_hdr *ipv6_hdr, uint16_t portid,\n+get_ipv6_dst_port(struct rte_ipv6_hdr *ipv6_hdr, uint16_t portid,\n \t\t\tlookup_struct_t *ipv6_l3fwd_lookup_struct)\n {\n \tstruct ipv6_5tuple key;\n@@ -578,14 +578,14 @@ get_ipv6_dst_port(struct ipv6_hdr *ipv6_hdr, uint16_t portid,\n \tswitch (ipv6_hdr->proto) {\n \tcase IPPROTO_TCP:\n \t\ttcp = (struct tcp_hdr *)((unsigned char *) ipv6_hdr +\n-\t\t\t\t\tsizeof(struct ipv6_hdr));\n+\t\t\t\t\tsizeof(struct rte_ipv6_hdr));\n \t\tkey.port_dst = rte_be_to_cpu_16(tcp->dst_port);\n \t\tkey.port_src = rte_be_to_cpu_16(tcp->src_port);\n \t\tbreak;\n \n \tcase IPPROTO_UDP:\n \t\tudp = (struct udp_hdr *)((unsigned char *) ipv6_hdr +\n-\t\t\t\t\tsizeof(struct ipv6_hdr));\n+\t\t\t\t\tsizeof(struct rte_ipv6_hdr));\n \t\tkey.port_dst = rte_be_to_cpu_16(udp->dst_port);\n \t\tkey.port_src = rte_be_to_cpu_16(udp->src_port);\n \t\tbreak;\n@@ -604,7 +604,7 @@ get_ipv6_dst_port(struct ipv6_hdr *ipv6_hdr, uint16_t portid,\n \n #if (APP_LOOKUP_METHOD == APP_LOOKUP_LPM)\n static inline uint16_t\n-get_ipv4_dst_port(struct ipv4_hdr *ipv4_hdr, uint16_t portid,\n+get_ipv4_dst_port(struct rte_ipv4_hdr *ipv4_hdr, uint16_t portid,\n \t\tlookup_struct_t *ipv4_l3fwd_lookup_struct)\n {\n \tuint32_t next_hop;\n@@ -662,7 +662,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid,\n \t\t\t\tstruct lcore_conf *qconf)\n {\n \tstruct rte_ether_hdr *eth_hdr;\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tvoid *d_addr_bytes;\n \tuint16_t dst_port;\n \n@@ -671,7 +671,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid,\n \tif (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {\n \t\t/* Handle IPv4 headers.*/\n \t\tipv4_hdr =\n-\t\t\trte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,\n+\t\t\trte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *,\n \t\t\t\t\t\tsizeof(struct rte_ether_hdr));\n \n #ifdef DO_RFC_1812_CHECKS\n@@ -706,10 +706,10 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid,\n \t} else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {\n \t\t/* Handle IPv6 headers.*/\n #if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)\n-\t\tstruct ipv6_hdr *ipv6_hdr;\n+\t\tstruct rte_ipv6_hdr *ipv6_hdr;\n \n \t\tipv6_hdr =\n-\t\t\trte_pktmbuf_mtod_offset(m, struct ipv6_hdr *,\n+\t\t\trte_pktmbuf_mtod_offset(m, struct rte_ipv6_hdr *,\n \t\t\t\t\t\tsizeof(struct rte_ether_hdr));\n \n \t\tdst_port = get_ipv6_dst_port(ipv6_hdr, portid,\ndiff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c\nindex d9b636806..ebb2378dd 100644\n--- a/examples/l3fwd-vf/main.c\n+++ b/examples/l3fwd-vf/main.c\n@@ -314,14 +314,14 @@ send_single_packet(struct rte_mbuf *m, uint16_t port)\n \n #ifdef DO_RFC_1812_CHECKS\n static inline int\n-is_valid_ipv4_pkt(struct ipv4_hdr *pkt, uint32_t link_len)\n+is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)\n {\n \t/* From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2 */\n \t/*\n \t * 1. The packet length reported by the Link Layer must be large\n \t * enough to hold the minimum length legal IP datagram (20 bytes).\n \t */\n-\tif (link_len < sizeof(struct ipv4_hdr))\n+\tif (link_len < sizeof(struct rte_ipv4_hdr))\n \t\treturn -1;\n \n \t/* 2. The IP checksum must be correct. */\n@@ -346,7 +346,7 @@ is_valid_ipv4_pkt(struct ipv4_hdr *pkt, uint32_t link_len)\n \t * datagram header, whose length is specified in the IP header length\n \t * field.\n \t */\n-\tif (rte_cpu_to_be_16(pkt->total_length) < sizeof(struct ipv4_hdr))\n+\tif (rte_cpu_to_be_16(pkt->total_length) < sizeof(struct rte_ipv4_hdr))\n \t\treturn -5;\n \n \treturn 0;\n@@ -362,7 +362,7 @@ print_key(struct ipv4_5tuple key)\n }\n \n static inline uint16_t\n-get_dst_port(struct ipv4_hdr *ipv4_hdr, uint16_t portid,\n+get_dst_port(struct rte_ipv4_hdr *ipv4_hdr, uint16_t portid,\n \t      lookup_struct_t *l3fwd_lookup_struct)\n {\n \tstruct ipv4_5tuple key;\n@@ -377,14 +377,14 @@ get_dst_port(struct ipv4_hdr *ipv4_hdr, uint16_t portid,\n \tswitch (ipv4_hdr->next_proto_id) {\n \tcase IPPROTO_TCP:\n \t\ttcp = (struct tcp_hdr *)((unsigned char *) ipv4_hdr +\n-\t\t\t\t\tsizeof(struct ipv4_hdr));\n+\t\t\t\t\tsizeof(struct rte_ipv4_hdr));\n \t\tkey.port_dst = rte_be_to_cpu_16(tcp->dst_port);\n \t\tkey.port_src = rte_be_to_cpu_16(tcp->src_port);\n \t\tbreak;\n \n \tcase IPPROTO_UDP:\n \t\tudp = (struct udp_hdr *)((unsigned char *) ipv4_hdr +\n-\t\t\t\t\tsizeof(struct ipv4_hdr));\n+\t\t\t\t\tsizeof(struct rte_ipv4_hdr));\n \t\tkey.port_dst = rte_be_to_cpu_16(udp->dst_port);\n \t\tkey.port_src = rte_be_to_cpu_16(udp->src_port);\n \t\tbreak;\n@@ -402,7 +402,7 @@ get_dst_port(struct ipv4_hdr *ipv4_hdr, uint16_t portid,\n \n #if (APP_LOOKUP_METHOD == APP_LOOKUP_LPM)\n static inline uint32_t\n-get_dst_port(struct ipv4_hdr *ipv4_hdr, uint16_t portid,\n+get_dst_port(struct rte_ipv4_hdr *ipv4_hdr, uint16_t portid,\n \t      lookup_struct_t *l3fwd_lookup_struct)\n {\n \tuint32_t next_hop;\n@@ -418,13 +418,13 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid,\n \t\t      lookup_struct_t *l3fwd_lookup_struct)\n {\n \tstruct rte_ether_hdr *eth_hdr;\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tvoid *tmp;\n \tuint16_t dst_port;\n \n \teth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);\n \n-\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,\n+\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *,\n \t\t\t\t\t   sizeof(struct rte_ether_hdr));\n \n #ifdef DO_RFC_1812_CHECKS\ndiff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h\nindex 1893f8c3a..293fb1fa2 100644\n--- a/examples/l3fwd/l3fwd.h\n+++ b/examples/l3fwd/l3fwd.h\n@@ -130,14 +130,14 @@ send_single_packet(struct lcore_conf *qconf,\n \n #ifdef DO_RFC_1812_CHECKS\n static inline int\n-is_valid_ipv4_pkt(struct ipv4_hdr *pkt, uint32_t link_len)\n+is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)\n {\n \t/* From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2 */\n \t/*\n \t * 1. The packet length reported by the Link Layer must be large\n \t * enough to hold the minimum length legal IP datagram (20 bytes).\n \t */\n-\tif (link_len < sizeof(struct ipv4_hdr))\n+\tif (link_len < sizeof(struct rte_ipv4_hdr))\n \t\treturn -1;\n \n \t/* 2. The IP checksum must be correct. */\n@@ -162,7 +162,7 @@ is_valid_ipv4_pkt(struct ipv4_hdr *pkt, uint32_t link_len)\n \t * datagram header, whose length is specified in the IP header length\n \t * field.\n \t */\n-\tif (rte_cpu_to_be_16(pkt->total_length) < sizeof(struct ipv4_hdr))\n+\tif (rte_cpu_to_be_16(pkt->total_length) < sizeof(struct rte_ipv4_hdr))\n \t\treturn -5;\n \n \treturn 0;\ndiff --git a/examples/l3fwd/l3fwd_altivec.h b/examples/l3fwd/l3fwd_altivec.h\nindex 0c68aa01c..fc7996f88 100644\n--- a/examples/l3fwd/l3fwd_altivec.h\n+++ b/examples/l3fwd/l3fwd_altivec.h\n@@ -68,13 +68,13 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP])\n \t*p[2] = te[2];\n \t*p[3] = te[3];\n \n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[0] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[0] + 1),\n \t\t&dst_port[0], pkt[0]->packet_type);\n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[1] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[1] + 1),\n \t\t&dst_port[1], pkt[1]->packet_type);\n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[2] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[2] + 1),\n \t\t&dst_port[2], pkt[2]->packet_type);\n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[3] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[3] + 1),\n \t\t&dst_port[3], pkt[3]->packet_type);\n }\n \n@@ -129,7 +129,7 @@ process_packet(struct rte_mbuf *pkt, uint16_t *dst_port)\n \tte = *(vector unsigned int *)eth_hdr;\n \tve = (vector unsigned int)val_eth[dst_port[0]];\n \n-\trfc1812_process((struct ipv4_hdr *)(eth_hdr + 1), dst_port,\n+\trfc1812_process((struct rte_ipv4_hdr *)(eth_hdr + 1), dst_port,\n \t\t\tpkt->packet_type);\n \n \t/* dynamically vec_sel te and ve for MASK_ETH (0x3f) */\ndiff --git a/examples/l3fwd/l3fwd_common.h b/examples/l3fwd/l3fwd_common.h\nindex 0f4fcb427..7d83ff641 100644\n--- a/examples/l3fwd/l3fwd_common.h\n+++ b/examples/l3fwd/l3fwd_common.h\n@@ -14,7 +14,7 @@\n #define\tIPV4_MAX_VER_IHL_DIFF\t(IPV4_MAX_VER_IHL - IPV4_MIN_VER_IHL)\n \n /* Minimum value of IPV4 total length (20B) in network byte order. */\n-#define\tIPV4_MIN_LEN_BE\t(sizeof(struct ipv4_hdr) << 8)\n+#define\tIPV4_MIN_LEN_BE\t(sizeof(struct rte_ipv4_hdr) << 8)\n \n /*\n  * From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2:\n@@ -28,7 +28,7 @@\n  * to BAD_PORT value.\n  */\n static __rte_always_inline void\n-rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t ptype)\n+rfc1812_process(struct rte_ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t ptype)\n {\n \tuint8_t ihl;\n \ndiff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c\nindex b56b08646..fb55e196d 100644\n--- a/examples/l3fwd/l3fwd_em.c\n+++ b/examples/l3fwd/l3fwd_em.c\n@@ -252,7 +252,7 @@ em_get_ipv4_dst_port(void *ipv4_hdr, uint16_t portid, void *lookup_struct)\n \tstruct rte_hash *ipv4_l3fwd_lookup_struct =\n \t\t(struct rte_hash *)lookup_struct;\n \n-\tipv4_hdr = (uint8_t *)ipv4_hdr + offsetof(struct ipv4_hdr, time_to_live);\n+\tipv4_hdr = (uint8_t *)ipv4_hdr + offsetof(struct rte_ipv4_hdr, time_to_live);\n \n \t/*\n \t * Get 5 tuple: dst port, src port, dst IP address,\n@@ -273,7 +273,7 @@ em_get_ipv6_dst_port(void *ipv6_hdr, uint16_t portid, void *lookup_struct)\n \tstruct rte_hash *ipv6_l3fwd_lookup_struct =\n \t\t(struct rte_hash *)lookup_struct;\n \n-\tipv6_hdr = (uint8_t *)ipv6_hdr + offsetof(struct ipv6_hdr, payload_len);\n+\tipv6_hdr = (uint8_t *)ipv6_hdr + offsetof(struct rte_ipv6_hdr, payload_len);\n \tvoid *data0 = ipv6_hdr;\n \tvoid *data1 = ((uint8_t *)ipv6_hdr) + sizeof(xmm_t);\n \tvoid *data2 = ((uint8_t *)ipv6_hdr) + sizeof(xmm_t) + sizeof(xmm_t);\n@@ -566,17 +566,17 @@ em_parse_ptype(struct rte_mbuf *m)\n \tuint16_t ether_type;\n \tvoid *l3;\n \tint hdr_len;\n-\tstruct ipv4_hdr *ipv4_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \n \teth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);\n \tether_type = eth_hdr->ether_type;\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 ipv4_hdr *)l3;\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\tif (hdr_len == sizeof(struct ipv4_hdr)) {\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)\n \t\t\t\tpacket_type |= RTE_PTYPE_L4_TCP;\n@@ -585,7 +585,7 @@ em_parse_ptype(struct rte_mbuf *m)\n \t\t} else\n \t\t\tpacket_type |= RTE_PTYPE_L3_IPV4_EXT;\n \t} else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) {\n-\t\tipv6_hdr = (struct ipv6_hdr *)l3;\n+\t\tipv6_hdr = (struct rte_ipv6_hdr *)l3;\n \t\tif (ipv6_hdr->proto == IPPROTO_TCP)\n \t\t\tpacket_type |= RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_TCP;\n \t\telse if (ipv6_hdr->proto == IPPROTO_UDP)\ndiff --git a/examples/l3fwd/l3fwd_em.h b/examples/l3fwd/l3fwd_em.h\nindex 4a7336350..62ae1bf30 100644\n--- a/examples/l3fwd/l3fwd_em.h\n+++ b/examples/l3fwd/l3fwd_em.h\n@@ -10,7 +10,7 @@ l3fwd_em_simple_forward(struct rte_mbuf *m, uint16_t portid,\n \t\tstruct lcore_conf *qconf)\n {\n \tstruct rte_ether_hdr *eth_hdr;\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tuint16_t dst_port;\n \tuint32_t tcp_or_udp;\n \tuint32_t l3_ptypes;\n@@ -21,7 +21,7 @@ l3fwd_em_simple_forward(struct rte_mbuf *m, uint16_t portid,\n \n \tif (tcp_or_udp && (l3_ptypes == RTE_PTYPE_L3_IPV4)) {\n \t\t/* Handle IPv4 headers.*/\n-\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,\n+\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *,\n \t\t\t\t\t\t   sizeof(struct rte_ether_hdr));\n \n #ifdef DO_RFC_1812_CHECKS\n@@ -52,9 +52,9 @@ l3fwd_em_simple_forward(struct rte_mbuf *m, uint16_t portid,\n \t\tsend_single_packet(qconf, m, dst_port);\n \t} else if (tcp_or_udp && (l3_ptypes == RTE_PTYPE_L3_IPV6)) {\n \t\t/* Handle IPv6 headers.*/\n-\t\tstruct ipv6_hdr *ipv6_hdr;\n+\t\tstruct rte_ipv6_hdr *ipv6_hdr;\n \n-\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct ipv6_hdr *,\n+\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv6_hdr *,\n \t\t\t\t\t\t   sizeof(struct rte_ether_hdr));\n \n \t\tdst_port = em_get_ipv6_dst_port(ipv6_hdr, portid,\ndiff --git a/examples/l3fwd/l3fwd_em_hlm.h b/examples/l3fwd/l3fwd_em_hlm.h\nindex 5afe77591..4476a91f3 100644\n--- a/examples/l3fwd/l3fwd_em_hlm.h\n+++ b/examples/l3fwd/l3fwd_em_hlm.h\n@@ -80,8 +80,8 @@ em_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,\n \t\tuint16_t portid)\n {\n \tuint16_t next_hop;\n-\tstruct ipv4_hdr *ipv4_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \tuint32_t tcp_or_udp;\n \tuint32_t l3_ptypes;\n \n@@ -91,7 +91,7 @@ em_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,\n \tif (tcp_or_udp && (l3_ptypes == RTE_PTYPE_L3_IPV4)) {\n \n \t\t/* Handle IPv4 headers.*/\n-\t\tipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct ipv4_hdr *,\n+\t\tipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,\n \t\t\t\tsizeof(struct rte_ether_hdr));\n \n \t\tnext_hop = em_get_ipv4_dst_port(ipv4_hdr, portid,\n@@ -106,7 +106,7 @@ em_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,\n \t} else if (tcp_or_udp && (l3_ptypes == RTE_PTYPE_L3_IPV6)) {\n \n \t\t/* Handle IPv6 headers.*/\n-\t\tipv6_hdr = rte_pktmbuf_mtod_offset(pkt, struct ipv6_hdr *,\n+\t\tipv6_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv6_hdr *,\n \t\t\t\tsizeof(struct rte_ether_hdr));\n \n \t\tnext_hop = em_get_ipv6_dst_port(ipv6_hdr, portid,\ndiff --git a/examples/l3fwd/l3fwd_em_hlm_neon.h b/examples/l3fwd/l3fwd_em_hlm_neon.h\nindex 3ee2304b5..3aaf71428 100644\n--- a/examples/l3fwd/l3fwd_em_hlm_neon.h\n+++ b/examples/l3fwd/l3fwd_em_hlm_neon.h\n@@ -14,7 +14,7 @@ get_ipv4_5tuple(struct rte_mbuf *m0, int32x4_t mask0,\n {\n \tint32x4_t tmpdata0 = vld1q_s32(rte_pktmbuf_mtod_offset(m0, int32_t *,\n \t\t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\t\toffsetof(struct ipv4_hdr, time_to_live)));\n+\t\t\t\toffsetof(struct rte_ipv4_hdr, time_to_live)));\n \n \tkey->xmm = vandq_s32(tmpdata0, mask0);\n }\n@@ -26,17 +26,17 @@ get_ipv6_5tuple(struct rte_mbuf *m0, int32x4_t mask0,\n \tint32x4_t tmpdata0 = vld1q_s32(\n \t\t\trte_pktmbuf_mtod_offset(m0, int *,\n \t\t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\t\toffsetof(struct ipv6_hdr, payload_len)));\n+\t\t\t\toffsetof(struct rte_ipv6_hdr, payload_len)));\n \n \tint32x4_t tmpdata1 = vld1q_s32(\n \t\t\trte_pktmbuf_mtod_offset(m0, int *,\n \t\t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\t\toffsetof(struct ipv6_hdr, payload_len) + 8));\n+\t\t\t\toffsetof(struct rte_ipv6_hdr, payload_len) + 8));\n \n \tint32x4_t tmpdata2 = vld1q_s32(\n \t\t\trte_pktmbuf_mtod_offset(m0, int *,\n \t\t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\t\toffsetof(struct ipv6_hdr, payload_len) + 16));\n+\t\t\t\toffsetof(struct rte_ipv6_hdr, payload_len) + 16));\n \n \tkey->xmm[0] = vandq_s32(tmpdata0, mask0);\n \tkey->xmm[1] = tmpdata1;\ndiff --git a/examples/l3fwd/l3fwd_em_hlm_sse.h b/examples/l3fwd/l3fwd_em_hlm_sse.h\nindex 8156bbb90..7964a9277 100644\n--- a/examples/l3fwd/l3fwd_em_hlm_sse.h\n+++ b/examples/l3fwd/l3fwd_em_hlm_sse.h\n@@ -14,7 +14,7 @@ get_ipv4_5tuple(struct rte_mbuf *m0, __m128i mask0,\n \t __m128i tmpdata0 = _mm_loadu_si128(\n \t\t\trte_pktmbuf_mtod_offset(m0, __m128i *,\n \t\t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\t\toffsetof(struct ipv4_hdr, time_to_live)));\n+\t\t\t\toffsetof(struct rte_ipv4_hdr, time_to_live)));\n \n \tkey->xmm = _mm_and_si128(tmpdata0, mask0);\n }\n@@ -26,18 +26,18 @@ get_ipv6_5tuple(struct rte_mbuf *m0, __m128i mask0,\n \t__m128i tmpdata0 = _mm_loadu_si128(\n \t\t\trte_pktmbuf_mtod_offset(m0, __m128i *,\n \t\t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\t\toffsetof(struct ipv6_hdr, payload_len)));\n+\t\t\t\toffsetof(struct rte_ipv6_hdr, payload_len)));\n \n \t__m128i tmpdata1 = _mm_loadu_si128(\n \t\t\trte_pktmbuf_mtod_offset(m0, __m128i *,\n \t\t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\t\toffsetof(struct ipv6_hdr, payload_len) +\n+\t\t\t\toffsetof(struct rte_ipv6_hdr, payload_len) +\n \t\t\t\tsizeof(__m128i)));\n \n \t__m128i tmpdata2 = _mm_loadu_si128(\n \t\t\trte_pktmbuf_mtod_offset(m0, __m128i *,\n \t\t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\t\toffsetof(struct ipv6_hdr, payload_len) +\n+\t\t\t\toffsetof(struct rte_ipv6_hdr, payload_len) +\n \t\t\t\tsizeof(__m128i) + sizeof(__m128i)));\n \n \tkey->xmm[0] = _mm_and_si128(tmpdata0, mask0);\ndiff --git a/examples/l3fwd/l3fwd_em_sequential.h b/examples/l3fwd/l3fwd_em_sequential.h\nindex 6e7096c01..8307c20dd 100644\n--- a/examples/l3fwd/l3fwd_em_sequential.h\n+++ b/examples/l3fwd/l3fwd_em_sequential.h\n@@ -25,8 +25,8 @@ em_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,\n \t\tuint16_t portid)\n {\n \tuint8_t next_hop;\n-\tstruct ipv4_hdr *ipv4_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \tuint32_t tcp_or_udp;\n \tuint32_t l3_ptypes;\n \n@@ -36,7 +36,7 @@ em_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,\n \tif (tcp_or_udp && (l3_ptypes == RTE_PTYPE_L3_IPV4)) {\n \n \t\t/* Handle IPv4 headers.*/\n-\t\tipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct ipv4_hdr *,\n+\t\tipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,\n \t\t\t\tsizeof(struct rte_ether_hdr));\n \n \t\tnext_hop = em_get_ipv4_dst_port(ipv4_hdr, portid,\n@@ -51,7 +51,7 @@ em_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,\n \t} else if (tcp_or_udp && (l3_ptypes == RTE_PTYPE_L3_IPV6)) {\n \n \t\t/* Handle IPv6 headers.*/\n-\t\tipv6_hdr = rte_pktmbuf_mtod_offset(pkt, struct ipv6_hdr *,\n+\t\tipv6_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv6_hdr *,\n \t\t\t\tsizeof(struct rte_ether_hdr));\n \n \t\tnext_hop = em_get_ipv6_dst_port(ipv6_hdr, portid,\ndiff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c\nindex 96143d871..881b0c7c0 100644\n--- a/examples/l3fwd/l3fwd_lpm.c\n+++ b/examples/l3fwd/l3fwd_lpm.c\n@@ -82,7 +82,7 @@ lpm_get_ipv4_dst_port(void *ipv4_hdr, uint16_t portid, void *lookup_struct)\n \t\t(struct rte_lpm *)lookup_struct;\n \n \treturn (uint16_t) ((rte_lpm_lookup(ipv4_l3fwd_lookup_struct,\n-\t\trte_be_to_cpu_32(((struct ipv4_hdr *)ipv4_hdr)->dst_addr),\n+\t\trte_be_to_cpu_32(((struct rte_ipv4_hdr *)ipv4_hdr)->dst_addr),\n \t\t&next_hop) == 0) ? next_hop : portid);\n }\n \n@@ -94,7 +94,7 @@ lpm_get_ipv6_dst_port(void *ipv6_hdr, uint16_t portid, void *lookup_struct)\n \t\t(struct rte_lpm6 *)lookup_struct;\n \n \treturn (uint16_t) ((rte_lpm6_lookup(ipv6_l3fwd_lookup_struct,\n-\t\t\t((struct ipv6_hdr *)ipv6_hdr)->dst_addr,\n+\t\t\t((struct rte_ipv6_hdr *)ipv6_hdr)->dst_addr,\n \t\t\t&next_hop) == 0) ?  next_hop : portid);\n }\n \n@@ -102,21 +102,21 @@ static __rte_always_inline uint16_t\n lpm_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,\n \t\tuint16_t portid)\n {\n-\tstruct ipv6_hdr *ipv6_hdr;\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tstruct rte_ether_hdr *eth_hdr;\n \n \tif (RTE_ETH_IS_IPV4_HDR(pkt->packet_type)) {\n \n \t\teth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);\n-\t\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\t\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \n \t\treturn lpm_get_ipv4_dst_port(ipv4_hdr, portid,\n \t\t\t\t\t     qconf->ipv4_lookup_struct);\n \t} else if (RTE_ETH_IS_IPV6_HDR(pkt->packet_type)) {\n \n \t\teth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);\n-\t\tipv6_hdr = (struct ipv6_hdr *)(eth_hdr + 1);\n+\t\tipv6_hdr = (struct rte_ipv6_hdr *)(eth_hdr + 1);\n \n \t\treturn lpm_get_ipv6_dst_port(ipv6_hdr, portid,\n \t\t\t\t\t     qconf->ipv6_lookup_struct);\n@@ -135,7 +135,7 @@ lpm_get_dst_port_with_ipv4(const struct lcore_conf *qconf, struct rte_mbuf *pkt,\n \tuint32_t dst_ipv4, uint16_t portid)\n {\n \tuint32_t next_hop;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \tstruct rte_ether_hdr *eth_hdr;\n \n \tif (RTE_ETH_IS_IPV4_HDR(pkt->packet_type)) {\n@@ -146,7 +146,7 @@ lpm_get_dst_port_with_ipv4(const struct lcore_conf *qconf, struct rte_mbuf *pkt,\n \t} else if (RTE_ETH_IS_IPV6_HDR(pkt->packet_type)) {\n \n \t\teth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);\n-\t\tipv6_hdr = (struct ipv6_hdr *)(eth_hdr + 1);\n+\t\tipv6_hdr = (struct rte_ipv6_hdr *)(eth_hdr + 1);\n \n \t\treturn (uint16_t) ((rte_lpm6_lookup(qconf->ipv6_lookup_struct,\n \t\t\t\tipv6_hdr->dst_addr, &next_hop) == 0)\ndiff --git a/examples/l3fwd/l3fwd_lpm.h b/examples/l3fwd/l3fwd_lpm.h\nindex 323f853ee..05faa5426 100644\n--- a/examples/l3fwd/l3fwd_lpm.h\n+++ b/examples/l3fwd/l3fwd_lpm.h\n@@ -10,14 +10,14 @@ l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint16_t portid,\n \t\tstruct lcore_conf *qconf)\n {\n \tstruct rte_ether_hdr *eth_hdr;\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tuint16_t dst_port;\n \n \teth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);\n \n \tif (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {\n \t\t/* Handle IPv4 headers.*/\n-\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,\n+\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *,\n \t\t\t\t\t\t   sizeof(struct rte_ether_hdr));\n \n #ifdef DO_RFC_1812_CHECKS\n@@ -48,9 +48,9 @@ l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint16_t portid,\n \t\tsend_single_packet(qconf, m, dst_port);\n \t} else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {\n \t\t/* Handle IPv6 headers.*/\n-\t\tstruct ipv6_hdr *ipv6_hdr;\n+\t\tstruct rte_ipv6_hdr *ipv6_hdr;\n \n-\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct ipv6_hdr *,\n+\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv6_hdr *,\n \t\t\t\t\t\t   sizeof(struct rte_ether_hdr));\n \n \t\tdst_port = lpm_get_ipv6_dst_port(ipv6_hdr, portid,\ndiff --git a/examples/l3fwd/l3fwd_lpm_altivec.h b/examples/l3fwd/l3fwd_lpm_altivec.h\nindex b36e991ac..7c6814252 100644\n--- a/examples/l3fwd/l3fwd_lpm_altivec.h\n+++ b/examples/l3fwd/l3fwd_lpm_altivec.h\n@@ -17,30 +17,30 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP],\n \t\tvector unsigned int *dip,\n \t\tuint32_t *ipv4_flag)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tstruct rte_ether_hdr *eth_hdr;\n \tuint32_t x0, x1, x2, x3;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[0], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tx0 = ipv4_hdr->dst_addr;\n \tipv4_flag[0] = pkt[0]->packet_type & RTE_PTYPE_L3_IPV4;\n \n \trte_compiler_barrier();\n \teth_hdr = rte_pktmbuf_mtod(pkt[1], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tx1 = ipv4_hdr->dst_addr;\n \tipv4_flag[0] &= pkt[1]->packet_type;\n \n \trte_compiler_barrier();\n \teth_hdr = rte_pktmbuf_mtod(pkt[2], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tx2 = ipv4_hdr->dst_addr;\n \tipv4_flag[0] &= pkt[2]->packet_type;\n \n \trte_compiler_barrier();\n \teth_hdr = rte_pktmbuf_mtod(pkt[3], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tx3 = ipv4_hdr->dst_addr;\n \tipv4_flag[0] &= pkt[3]->packet_type;\n \ndiff --git a/examples/l3fwd/l3fwd_lpm_neon.h b/examples/l3fwd/l3fwd_lpm_neon.h\nindex a3e42cfa7..d6c0ba64a 100644\n--- a/examples/l3fwd/l3fwd_lpm_neon.h\n+++ b/examples/l3fwd/l3fwd_lpm_neon.h\n@@ -18,27 +18,27 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP],\n \t\tint32x4_t *dip,\n \t\tuint32_t *ipv4_flag)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tstruct rte_ether_hdr *eth_hdr;\n \tint32_t dst[FWDSTEP];\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[0], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tdst[0] = ipv4_hdr->dst_addr;\n \tipv4_flag[0] = pkt[0]->packet_type & RTE_PTYPE_L3_IPV4;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[1], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tdst[1] = ipv4_hdr->dst_addr;\n \tipv4_flag[0] &= pkt[1]->packet_type;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[2], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tdst[2] = ipv4_hdr->dst_addr;\n \tipv4_flag[0] &= pkt[2]->packet_type;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[3], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tdst[3] = ipv4_hdr->dst_addr;\n \tipv4_flag[0] &= pkt[3]->packet_type;\n \ndiff --git a/examples/l3fwd/l3fwd_lpm_sse.h b/examples/l3fwd/l3fwd_lpm_sse.h\nindex 4603e0749..3f637a23d 100644\n--- a/examples/l3fwd/l3fwd_lpm_sse.h\n+++ b/examples/l3fwd/l3fwd_lpm_sse.h\n@@ -15,27 +15,27 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP],\n \t\t__m128i *dip,\n \t\tuint32_t *ipv4_flag)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tstruct rte_ether_hdr *eth_hdr;\n \tuint32_t x0, x1, x2, x3;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[0], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tx0 = ipv4_hdr->dst_addr;\n \tipv4_flag[0] = pkt[0]->packet_type & RTE_PTYPE_L3_IPV4;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[1], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tx1 = ipv4_hdr->dst_addr;\n \tipv4_flag[0] &= pkt[1]->packet_type;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[2], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tx2 = ipv4_hdr->dst_addr;\n \tipv4_flag[0] &= pkt[2]->packet_type;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[3], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tx3 = ipv4_hdr->dst_addr;\n \tipv4_flag[0] &= pkt[3]->packet_type;\n \ndiff --git a/examples/l3fwd/l3fwd_neon.h b/examples/l3fwd/l3fwd_neon.h\nindex af2dc47ac..712c3a704 100644\n--- a/examples/l3fwd/l3fwd_neon.h\n+++ b/examples/l3fwd/l3fwd_neon.h\n@@ -48,13 +48,13 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP])\n \tvst1q_u32(p[2], ve[2]);\n \tvst1q_u32(p[3], ve[3]);\n \n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[0] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[0] + 1),\n \t\t&dst_port[0], pkt[0]->packet_type);\n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[1] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[1] + 1),\n \t\t&dst_port[1], pkt[1]->packet_type);\n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[2] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[2] + 1),\n \t\t&dst_port[2], pkt[2]->packet_type);\n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[3] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[3] + 1),\n \t\t&dst_port[3], pkt[3]->packet_type);\n }\n \n@@ -113,7 +113,7 @@ process_packet(struct rte_mbuf *pkt, uint16_t *dst_port)\n \tve = vreinterpretq_u32_s32(val_eth[dst_port[0]]);\n \n \n-\trfc1812_process((struct ipv4_hdr *)(eth_hdr + 1), dst_port,\n+\trfc1812_process((struct rte_ipv4_hdr *)(eth_hdr + 1), dst_port,\n \t\t\tpkt->packet_type);\n \n \tve = vcopyq_laneq_u32(ve, 3, te, 3);\ndiff --git a/examples/l3fwd/l3fwd_sse.h b/examples/l3fwd/l3fwd_sse.h\nindex 3349f2747..5919f48b9 100644\n--- a/examples/l3fwd/l3fwd_sse.h\n+++ b/examples/l3fwd/l3fwd_sse.h\n@@ -48,13 +48,13 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP])\n \t_mm_storeu_si128(p[2], te[2]);\n \t_mm_storeu_si128(p[3], te[3]);\n \n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[0] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[0] + 1),\n \t\t&dst_port[0], pkt[0]->packet_type);\n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[1] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[1] + 1),\n \t\t&dst_port[1], pkt[1]->packet_type);\n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[2] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[2] + 1),\n \t\t&dst_port[2], pkt[2]->packet_type);\n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[3] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[3] + 1),\n \t\t&dst_port[3], pkt[3]->packet_type);\n }\n \n@@ -109,7 +109,7 @@ process_packet(struct rte_mbuf *pkt, uint16_t *dst_port)\n \tte = _mm_loadu_si128((__m128i *)eth_hdr);\n \tve = val_eth[dst_port[0]];\n \n-\trfc1812_process((struct ipv4_hdr *)(eth_hdr + 1), dst_port,\n+\trfc1812_process((struct rte_ipv4_hdr *)(eth_hdr + 1), dst_port,\n \t\t\tpkt->packet_type);\n \n \tte =  _mm_blend_epi16(te, ve, MASK_ETH);\ndiff --git a/examples/load_balancer/runtime.c b/examples/load_balancer/runtime.c\nindex c4e6b4ac8..ff76c8d5b 100644\n--- a/examples/load_balancer/runtime.c\n+++ b/examples/load_balancer/runtime.c\n@@ -495,7 +495,7 @@ app_lcore_worker(\n \n \t\tfor (j = 0; j < bsz_rd; j ++) {\n \t\t\tstruct rte_mbuf *pkt;\n-\t\t\tstruct ipv4_hdr *ipv4_hdr;\n+\t\t\tstruct rte_ipv4_hdr *ipv4_hdr;\n \t\t\tuint32_t ipv4_dst, pos;\n \t\t\tuint32_t port;\n \n@@ -508,7 +508,7 @@ app_lcore_worker(\n \n \t\t\tpkt = lp->mbuf_in.array[j];\n \t\t\tipv4_hdr = rte_pktmbuf_mtod_offset(pkt,\n-\t\t\t\t\t\t\t   struct ipv4_hdr *,\n+\t\t\t\t\t\t\t   struct rte_ipv4_hdr *,\n \t\t\t\t\t\t\t   sizeof(struct rte_ether_hdr));\n \t\t\tipv4_dst = rte_be_to_cpu_32(ipv4_hdr->dst_addr);\n \ndiff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c\nindex 3d2ceea2f..da5c66203 100644\n--- a/examples/performance-thread/l3fwd-thread/main.c\n+++ b/examples/performance-thread/l3fwd-thread/main.c\n@@ -751,14 +751,14 @@ send_packetsx4(uint16_t port,\n \n #ifdef DO_RFC_1812_CHECKS\n static inline int\n-is_valid_ipv4_pkt(struct ipv4_hdr *pkt, uint32_t link_len)\n+is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)\n {\n \t/* From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2 */\n \t/*\n \t * 1. The packet length reported by the Link Layer must be large\n \t * enough to hold the minimum length legal IP datagram (20 bytes).\n \t */\n-\tif (link_len < sizeof(struct ipv4_hdr))\n+\tif (link_len < sizeof(struct rte_ipv4_hdr))\n \t\treturn -1;\n \n \t/* 2. The IP checksum must be correct. */\n@@ -783,7 +783,7 @@ is_valid_ipv4_pkt(struct ipv4_hdr *pkt, uint32_t link_len)\n \t * datagram header, whose length is specified in the IP header length\n \t * field.\n \t */\n-\tif (rte_cpu_to_be_16(pkt->total_length) < sizeof(struct ipv4_hdr))\n+\tif (rte_cpu_to_be_16(pkt->total_length) < sizeof(struct rte_ipv4_hdr))\n \t\treturn -5;\n \n \treturn 0;\n@@ -802,7 +802,7 @@ get_ipv4_dst_port(void *ipv4_hdr, uint16_t portid,\n \tint ret = 0;\n \tunion ipv4_5tuple_host key;\n \n-\tipv4_hdr = (uint8_t *)ipv4_hdr + offsetof(struct ipv4_hdr, time_to_live);\n+\tipv4_hdr = (uint8_t *)ipv4_hdr + offsetof(struct rte_ipv4_hdr, time_to_live);\n \t__m128i data = _mm_loadu_si128((__m128i *)(ipv4_hdr));\n \t/* Get 5 tuple: dst port, src port, dst IP address, src IP address and\n \t   protocol */\n@@ -819,7 +819,7 @@ get_ipv6_dst_port(void *ipv6_hdr, uint16_t portid,\n \tint ret = 0;\n \tunion ipv6_5tuple_host key;\n \n-\tipv6_hdr = (uint8_t *)ipv6_hdr + offsetof(struct ipv6_hdr, payload_len);\n+\tipv6_hdr = (uint8_t *)ipv6_hdr + offsetof(struct rte_ipv6_hdr, payload_len);\n \t__m128i data0 = _mm_loadu_si128((__m128i *)(ipv6_hdr));\n \t__m128i data1 = _mm_loadu_si128((__m128i *)(((uint8_t *)ipv6_hdr) +\n \t\t\tsizeof(__m128i)));\n@@ -849,7 +849,7 @@ get_ipv4_dst_port(void *ipv4_hdr, uint16_t portid,\n \tuint32_t next_hop;\n \n \treturn ((rte_lpm_lookup(ipv4_l3fwd_lookup_struct,\n-\t\trte_be_to_cpu_32(((struct ipv4_hdr *)ipv4_hdr)->dst_addr),\n+\t\trte_be_to_cpu_32(((struct rte_ipv4_hdr *)ipv4_hdr)->dst_addr),\n \t\t&next_hop) == 0) ? next_hop : portid);\n }\n \n@@ -860,7 +860,7 @@ get_ipv6_dst_port(void *ipv6_hdr,  uint16_t portid,\n \tuint32_t next_hop;\n \n \treturn ((rte_lpm6_lookup(ipv6_l3fwd_lookup_struct,\n-\t\t\t((struct ipv6_hdr *)ipv6_hdr)->dst_addr, &next_hop) == 0) ?\n+\t\t\t((struct rte_ipv6_hdr *)ipv6_hdr)->dst_addr, &next_hop) == 0) ?\n \t\t\tnext_hop : portid);\n }\n #endif\n@@ -885,7 +885,7 @@ static inline void\n simple_ipv4_fwd_8pkts(struct rte_mbuf *m[8], uint16_t portid)\n {\n \tstruct rte_ether_hdr *eth_hdr[8];\n-\tstruct ipv4_hdr *ipv4_hdr[8];\n+\tstruct rte_ipv4_hdr *ipv4_hdr[8];\n \tuint16_t dst_port[8];\n \tint32_t ret[8];\n \tunion ipv4_5tuple_host key[8];\n@@ -901,21 +901,21 @@ simple_ipv4_fwd_8pkts(struct rte_mbuf *m[8], uint16_t portid)\n \teth_hdr[7] = rte_pktmbuf_mtod(m[7], struct rte_ether_hdr *);\n \n \t/* Handle IPv4 headers.*/\n-\tipv4_hdr[0] = rte_pktmbuf_mtod_offset(m[0], struct ipv4_hdr *,\n+\tipv4_hdr[0] = rte_pktmbuf_mtod_offset(m[0], struct rte_ipv4_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv4_hdr[1] = rte_pktmbuf_mtod_offset(m[1], struct ipv4_hdr *,\n+\tipv4_hdr[1] = rte_pktmbuf_mtod_offset(m[1], struct rte_ipv4_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv4_hdr[2] = rte_pktmbuf_mtod_offset(m[2], struct ipv4_hdr *,\n+\tipv4_hdr[2] = rte_pktmbuf_mtod_offset(m[2], struct rte_ipv4_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv4_hdr[3] = rte_pktmbuf_mtod_offset(m[3], struct ipv4_hdr *,\n+\tipv4_hdr[3] = rte_pktmbuf_mtod_offset(m[3], struct rte_ipv4_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv4_hdr[4] = rte_pktmbuf_mtod_offset(m[4], struct ipv4_hdr *,\n+\tipv4_hdr[4] = rte_pktmbuf_mtod_offset(m[4], struct rte_ipv4_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv4_hdr[5] = rte_pktmbuf_mtod_offset(m[5], struct ipv4_hdr *,\n+\tipv4_hdr[5] = rte_pktmbuf_mtod_offset(m[5], struct rte_ipv4_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv4_hdr[6] = rte_pktmbuf_mtod_offset(m[6], struct ipv4_hdr *,\n+\tipv4_hdr[6] = rte_pktmbuf_mtod_offset(m[6], struct rte_ipv4_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv4_hdr[7] = rte_pktmbuf_mtod_offset(m[7], struct ipv4_hdr *,\n+\tipv4_hdr[7] = rte_pktmbuf_mtod_offset(m[7], struct rte_ipv4_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n \n #ifdef DO_RFC_1812_CHECKS\n@@ -968,28 +968,28 @@ simple_ipv4_fwd_8pkts(struct rte_mbuf *m[8], uint16_t portid)\n \n \tdata[0] = _mm_loadu_si128(rte_pktmbuf_mtod_offset(m[0], __m128i *,\n \t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, time_to_live)));\n+\t\t\toffsetof(struct rte_ipv4_hdr, time_to_live)));\n \tdata[1] = _mm_loadu_si128(rte_pktmbuf_mtod_offset(m[1], __m128i *,\n \t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, time_to_live)));\n+\t\t\toffsetof(struct rte_ipv4_hdr, time_to_live)));\n \tdata[2] = _mm_loadu_si128(rte_pktmbuf_mtod_offset(m[2], __m128i *,\n \t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, time_to_live)));\n+\t\t\toffsetof(struct rte_ipv4_hdr, time_to_live)));\n \tdata[3] = _mm_loadu_si128(rte_pktmbuf_mtod_offset(m[3], __m128i *,\n \t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, time_to_live)));\n+\t\t\toffsetof(struct rte_ipv4_hdr, time_to_live)));\n \tdata[4] = _mm_loadu_si128(rte_pktmbuf_mtod_offset(m[4], __m128i *,\n \t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, time_to_live)));\n+\t\t\toffsetof(struct rte_ipv4_hdr, time_to_live)));\n \tdata[5] = _mm_loadu_si128(rte_pktmbuf_mtod_offset(m[5], __m128i *,\n \t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, time_to_live)));\n+\t\t\toffsetof(struct rte_ipv4_hdr, time_to_live)));\n \tdata[6] = _mm_loadu_si128(rte_pktmbuf_mtod_offset(m[6], __m128i *,\n \t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, time_to_live)));\n+\t\t\toffsetof(struct rte_ipv4_hdr, time_to_live)));\n \tdata[7] = _mm_loadu_si128(rte_pktmbuf_mtod_offset(m[7], __m128i *,\n \t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv4_hdr, time_to_live)));\n+\t\t\toffsetof(struct rte_ipv4_hdr, time_to_live)));\n \n \tkey[0].xmm = _mm_and_si128(data[0], mask0);\n \tkey[1].xmm = _mm_and_si128(data[1], mask0);\n@@ -1095,13 +1095,13 @@ static inline void get_ipv6_5tuple(struct rte_mbuf *m0, __m128i mask0,\n {\n \t__m128i tmpdata0 = _mm_loadu_si128(rte_pktmbuf_mtod_offset(m0,\n \t\t\t__m128i *, sizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv6_hdr, payload_len)));\n+\t\t\toffsetof(struct rte_ipv6_hdr, payload_len)));\n \t__m128i tmpdata1 = _mm_loadu_si128(rte_pktmbuf_mtod_offset(m0,\n \t\t\t__m128i *, sizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv6_hdr, payload_len) + sizeof(__m128i)));\n+\t\t\toffsetof(struct rte_ipv6_hdr, payload_len) + sizeof(__m128i)));\n \t__m128i tmpdata2 = _mm_loadu_si128(rte_pktmbuf_mtod_offset(m0,\n \t\t\t__m128i *, sizeof(struct rte_ether_hdr) +\n-\t\t\toffsetof(struct ipv6_hdr, payload_len) + sizeof(__m128i) +\n+\t\t\toffsetof(struct rte_ipv6_hdr, payload_len) + sizeof(__m128i) +\n \t\t\tsizeof(__m128i)));\n \tkey->xmm[0] = _mm_and_si128(tmpdata0, mask0);\n \tkey->xmm[1] = tmpdata1;\n@@ -1116,7 +1116,7 @@ simple_ipv6_fwd_8pkts(struct rte_mbuf *m[8], uint16_t portid)\n \tstruct rte_ether_hdr *eth_hdr[8];\n \tunion ipv6_5tuple_host key[8];\n \n-\t__attribute__((unused)) struct ipv6_hdr *ipv6_hdr[8];\n+\t__attribute__((unused)) struct rte_ipv6_hdr *ipv6_hdr[8];\n \n \teth_hdr[0] = rte_pktmbuf_mtod(m[0], struct rte_ether_hdr *);\n \teth_hdr[1] = rte_pktmbuf_mtod(m[1], struct rte_ether_hdr *);\n@@ -1128,21 +1128,21 @@ simple_ipv6_fwd_8pkts(struct rte_mbuf *m[8], uint16_t portid)\n \teth_hdr[7] = rte_pktmbuf_mtod(m[7], struct rte_ether_hdr *);\n \n \t/* Handle IPv6 headers.*/\n-\tipv6_hdr[0] = rte_pktmbuf_mtod_offset(m[0], struct ipv6_hdr *,\n+\tipv6_hdr[0] = rte_pktmbuf_mtod_offset(m[0], struct rte_ipv6_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv6_hdr[1] = rte_pktmbuf_mtod_offset(m[1], struct ipv6_hdr *,\n+\tipv6_hdr[1] = rte_pktmbuf_mtod_offset(m[1], struct rte_ipv6_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv6_hdr[2] = rte_pktmbuf_mtod_offset(m[2], struct ipv6_hdr *,\n+\tipv6_hdr[2] = rte_pktmbuf_mtod_offset(m[2], struct rte_ipv6_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv6_hdr[3] = rte_pktmbuf_mtod_offset(m[3], struct ipv6_hdr *,\n+\tipv6_hdr[3] = rte_pktmbuf_mtod_offset(m[3], struct rte_ipv6_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv6_hdr[4] = rte_pktmbuf_mtod_offset(m[4], struct ipv6_hdr *,\n+\tipv6_hdr[4] = rte_pktmbuf_mtod_offset(m[4], struct rte_ipv6_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv6_hdr[5] = rte_pktmbuf_mtod_offset(m[5], struct ipv6_hdr *,\n+\tipv6_hdr[5] = rte_pktmbuf_mtod_offset(m[5], struct rte_ipv6_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv6_hdr[6] = rte_pktmbuf_mtod_offset(m[6], struct ipv6_hdr *,\n+\tipv6_hdr[6] = rte_pktmbuf_mtod_offset(m[6], struct rte_ipv6_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n-\tipv6_hdr[7] = rte_pktmbuf_mtod_offset(m[7], struct ipv6_hdr *,\n+\tipv6_hdr[7] = rte_pktmbuf_mtod_offset(m[7], struct rte_ipv6_hdr *,\n \t\t\tsizeof(struct rte_ether_hdr));\n \n \tget_ipv6_5tuple(m[0], mask1, mask2, &key[0]);\n@@ -1229,14 +1229,14 @@ static __rte_always_inline void\n l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid)\n {\n \tstruct rte_ether_hdr *eth_hdr;\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tuint16_t dst_port;\n \n \teth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);\n \n \tif (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {\n \t\t/* Handle IPv4 headers.*/\n-\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,\n+\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *,\n \t\t\t\tsizeof(struct rte_ether_hdr));\n \n #ifdef DO_RFC_1812_CHECKS\n@@ -1267,9 +1267,9 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid)\n \t\tsend_single_packet(m, dst_port);\n \t} else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {\n \t\t/* Handle IPv6 headers.*/\n-\t\tstruct ipv6_hdr *ipv6_hdr;\n+\t\tstruct rte_ipv6_hdr *ipv6_hdr;\n \n-\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct ipv6_hdr *,\n+\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv6_hdr *,\n \t\t\t\tsizeof(struct rte_ether_hdr));\n \n \t\tdst_port = get_ipv6_dst_port(ipv6_hdr, portid,\n@@ -1300,7 +1300,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid)\n #define\tIPV4_MAX_VER_IHL_DIFF\t(IPV4_MAX_VER_IHL - IPV4_MIN_VER_IHL)\n \n /* Minimum value of IPV4 total length (20B) in network byte order. */\n-#define\tIPV4_MIN_LEN_BE\t(sizeof(struct ipv4_hdr) << 8)\n+#define\tIPV4_MIN_LEN_BE\t(sizeof(struct rte_ipv4_hdr) << 8)\n \n /*\n  * From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2:\n@@ -1314,7 +1314,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid)\n  * to BAD_PORT value.\n  */\n static __rte_always_inline void\n-rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t ptype)\n+rfc1812_process(struct rte_ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t ptype)\n {\n \tuint8_t ihl;\n \n@@ -1345,7 +1345,7 @@ static __rte_always_inline uint16_t\n get_dst_port(struct rte_mbuf *pkt, uint32_t dst_ipv4, uint16_t portid)\n {\n \tuint32_t next_hop;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \tstruct rte_ether_hdr *eth_hdr;\n \n \tif (RTE_ETH_IS_IPV4_HDR(pkt->packet_type)) {\n@@ -1356,7 +1356,7 @@ get_dst_port(struct rte_mbuf *pkt, uint32_t dst_ipv4, uint16_t portid)\n \t} else if (RTE_ETH_IS_IPV6_HDR(pkt->packet_type)) {\n \n \t\teth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);\n-\t\tipv6_hdr = (struct ipv6_hdr *)(eth_hdr + 1);\n+\t\tipv6_hdr = (struct rte_ipv6_hdr *)(eth_hdr + 1);\n \n \t\treturn (uint16_t) ((rte_lpm6_lookup(\n \t\t\t\tRTE_PER_LCORE(lcore_conf)->ipv6_lookup_struct,\n@@ -1372,13 +1372,13 @@ static inline void\n process_packet(struct rte_mbuf *pkt, uint16_t *dst_port, uint16_t portid)\n {\n \tstruct rte_ether_hdr *eth_hdr;\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tuint32_t dst_ipv4;\n \tuint16_t dp;\n \t__m128i te, ve;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \n \tdst_ipv4 = ipv4_hdr->dst_addr;\n \tdst_ipv4 = rte_be_to_cpu_32(dst_ipv4);\n@@ -1402,27 +1402,27 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP],\n \t\t__m128i *dip,\n \t\tuint32_t *ipv4_flag)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tstruct rte_ether_hdr *eth_hdr;\n \tuint32_t x0, x1, x2, x3;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[0], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tx0 = ipv4_hdr->dst_addr;\n \tipv4_flag[0] = pkt[0]->packet_type & RTE_PTYPE_L3_IPV4;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[1], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tx1 = ipv4_hdr->dst_addr;\n \tipv4_flag[0] &= pkt[1]->packet_type;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[2], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tx2 = ipv4_hdr->dst_addr;\n \tipv4_flag[0] &= pkt[2]->packet_type;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[3], struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \tx3 = ipv4_hdr->dst_addr;\n \tipv4_flag[0] &= pkt[3]->packet_type;\n \n@@ -1503,13 +1503,13 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP])\n \t_mm_store_si128(p[2], te[2]);\n \t_mm_store_si128(p[3], te[3]);\n \n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[0] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[0] + 1),\n \t\t\t&dst_port[0], pkt[0]->packet_type);\n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[1] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[1] + 1),\n \t\t\t&dst_port[1], pkt[1]->packet_type);\n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[2] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[2] + 1),\n \t\t\t&dst_port[2], pkt[2]->packet_type);\n-\trfc1812_process((struct ipv4_hdr *)((struct rte_ether_hdr *)p[3] + 1),\n+\trfc1812_process((struct rte_ipv4_hdr *)((struct rte_ether_hdr *)p[3] + 1),\n \t\t\t&dst_port[3], pkt[3]->packet_type);\n }\n \ndiff --git a/examples/server_node_efd/node/node.c b/examples/server_node_efd/node/node.c\nindex 8bec351ec..44216f999 100644\n--- a/examples/server_node_efd/node/node.c\n+++ b/examples/server_node_efd/node/node.c\n@@ -266,7 +266,7 @@ transmit_packet(struct rte_mbuf *buf)\n static inline void\n handle_packets(struct rte_hash *h, struct rte_mbuf **bufs, uint16_t num_packets)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tuint32_t ipv4_dst_ip[PKT_READ_SIZE];\n \tconst void *key_ptrs[PKT_READ_SIZE];\n \tunsigned int i;\n@@ -274,7 +274,7 @@ handle_packets(struct rte_hash *h, struct rte_mbuf **bufs, uint16_t num_packets)\n \n \tfor (i = 0; i < num_packets; i++) {\n \t\t/* Handle IPv4 header.*/\n-\t\tipv4_hdr = rte_pktmbuf_mtod_offset(bufs[i], struct ipv4_hdr *,\n+\t\tipv4_hdr = rte_pktmbuf_mtod_offset(bufs[i], struct rte_ipv4_hdr *,\n \t\t\t\tsizeof(struct rte_ether_hdr));\n \t\tipv4_dst_ip[i] = ipv4_hdr->dst_addr;\n \t\tkey_ptrs[i] = &ipv4_dst_ip[i];\ndiff --git a/examples/server_node_efd/server/main.c b/examples/server_node_efd/server/main.c\nindex a086c5a77..3e5295433 100644\n--- a/examples/server_node_efd/server/main.c\n+++ b/examples/server_node_efd/server/main.c\n@@ -247,12 +247,12 @@ process_packets(uint32_t port_num __rte_unused, struct rte_mbuf *pkts[],\n \tefd_value_t data[RTE_EFD_BURST_MAX];\n \tconst void *key_ptrs[RTE_EFD_BURST_MAX];\n \n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tuint32_t ipv4_dst_ip[RTE_EFD_BURST_MAX];\n \n \tfor (i = 0; i < rx_count; i++) {\n \t\t/* Handle IPv4 header.*/\n-\t\tipv4_hdr = rte_pktmbuf_mtod_offset(pkts[i], struct ipv4_hdr *,\n+\t\tipv4_hdr = rte_pktmbuf_mtod_offset(pkts[i], struct rte_ipv4_hdr *,\n \t\t\t\tsizeof(struct rte_ether_hdr));\n \t\tipv4_dst_ip[i] = ipv4_hdr->dst_addr;\n \t\tkey_ptrs[i] = (void *)&ipv4_dst_ip[i];\ndiff --git a/examples/tep_termination/vxlan.c b/examples/tep_termination/vxlan.c\nindex 48a46d536..8088d9412 100644\n--- a/examples/tep_termination/vxlan.c\n+++ b/examples/tep_termination/vxlan.c\n@@ -31,8 +31,8 @@ static void\n parse_ethernet(struct rte_ether_hdr *eth_hdr, union tunnel_offload_info *info,\n \t\tuint8_t *l4_proto)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \tuint16_t ethertype;\n \n \tinfo->outer_l2_len = sizeof(struct rte_ether_hdr);\n@@ -46,15 +46,15 @@ parse_ethernet(struct rte_ether_hdr *eth_hdr, union tunnel_offload_info *info,\n \n \tswitch (ethertype) {\n \tcase RTE_ETHER_TYPE_IPv4:\n-\t\tipv4_hdr = (struct ipv4_hdr *)\n+\t\tipv4_hdr = (struct rte_ipv4_hdr *)\n \t\t\t((char *)eth_hdr + info->outer_l2_len);\n-\t\tinfo->outer_l3_len = sizeof(struct ipv4_hdr);\n+\t\tinfo->outer_l3_len = sizeof(struct rte_ipv4_hdr);\n \t\t*l4_proto = ipv4_hdr->next_proto_id;\n \t\tbreak;\n \tcase RTE_ETHER_TYPE_IPv6:\n-\t\tipv6_hdr = (struct ipv6_hdr *)\n+\t\tipv6_hdr = (struct rte_ipv6_hdr *)\n \t\t\t((char *)eth_hdr + info->outer_l2_len);\n-\t\tinfo->outer_l3_len = sizeof(struct ipv6_hdr);\n+\t\tinfo->outer_l3_len = sizeof(struct rte_ipv6_hdr);\n \t\t*l4_proto = ipv6_hdr->proto;\n \t\tbreak;\n \tdefault:\n@@ -73,8 +73,8 @@ process_inner_cksums(struct rte_ether_hdr *eth_hdr, union tunnel_offload_info *i\n \tvoid *l3_hdr = NULL;\n \tuint8_t l4_proto;\n \tuint16_t ethertype;\n-\tstruct ipv4_hdr *ipv4_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \tstruct udp_hdr *udp_hdr;\n \tstruct tcp_hdr *tcp_hdr;\n \tstruct sctp_hdr *sctp_hdr;\n@@ -92,15 +92,15 @@ process_inner_cksums(struct rte_ether_hdr *eth_hdr, union tunnel_offload_info *i\n \tl3_hdr = (char *)eth_hdr + info->l2_len;\n \n \tif (ethertype == RTE_ETHER_TYPE_IPv4) {\n-\t\tipv4_hdr = (struct ipv4_hdr *)l3_hdr;\n+\t\tipv4_hdr = (struct rte_ipv4_hdr *)l3_hdr;\n \t\tipv4_hdr->hdr_checksum = 0;\n \t\tol_flags |= PKT_TX_IPV4;\n \t\tol_flags |= PKT_TX_IP_CKSUM;\n-\t\tinfo->l3_len = sizeof(struct ipv4_hdr);\n+\t\tinfo->l3_len = sizeof(struct rte_ipv4_hdr);\n \t\tl4_proto = ipv4_hdr->next_proto_id;\n \t} else if (ethertype == RTE_ETHER_TYPE_IPv6) {\n-\t\tipv6_hdr = (struct ipv6_hdr *)l3_hdr;\n-\t\tinfo->l3_len = sizeof(struct ipv6_hdr);\n+\t\tipv6_hdr = (struct rte_ipv6_hdr *)l3_hdr;\n+\t\tinfo->l3_len = sizeof(struct rte_ipv6_hdr);\n \t\tl4_proto = ipv6_hdr->proto;\n \t\tol_flags |= PKT_TX_IPV6;\n \t} else\n@@ -176,10 +176,10 @@ encapsulation(struct rte_mbuf *m, uint8_t queue_id)\n \n \t/*Allocate space for new ethernet, IPv4, UDP and VXLAN headers*/\n \tstruct rte_ether_hdr *pneth = (struct rte_ether_hdr *) rte_pktmbuf_prepend(m,\n-\t\tsizeof(struct rte_ether_hdr) + sizeof(struct ipv4_hdr)\n+\t\tsizeof(struct rte_ether_hdr) + sizeof(struct rte_ipv4_hdr)\n \t\t+ sizeof(struct udp_hdr) + sizeof(struct rte_vxlan_hdr));\n \n-\tstruct ipv4_hdr *ip = (struct ipv4_hdr *) &pneth[1];\n+\tstruct rte_ipv4_hdr *ip = (struct rte_ipv4_hdr *) &pneth[1];\n \tstruct udp_hdr *udp = (struct udp_hdr *) &ip[1];\n \tstruct rte_vxlan_hdr *vxlan = (struct rte_vxlan_hdr *) &udp[1];\n \n@@ -192,7 +192,7 @@ encapsulation(struct rte_mbuf *m, uint8_t queue_id)\n \n \t/* copy in IP header */\n \tip = rte_memcpy(ip, &app_ip_hdr[vport_id],\n-\t\tsizeof(struct ipv4_hdr));\n+\t\tsizeof(struct rte_ipv4_hdr));\n \tip->total_length = rte_cpu_to_be_16(m->pkt_len\n \t\t\t\t- sizeof(struct rte_ether_hdr));\n \n@@ -210,7 +210,7 @@ encapsulation(struct rte_mbuf *m, uint8_t queue_id)\n \t}\n \n \tm->outer_l2_len = sizeof(struct rte_ether_hdr);\n-\tm->outer_l3_len = sizeof(struct ipv4_hdr);\n+\tm->outer_l3_len = sizeof(struct rte_ipv4_hdr);\n \n \tol_flags |= PKT_TX_TUNNEL_VXLAN;\n \ndiff --git a/examples/tep_termination/vxlan.h b/examples/tep_termination/vxlan.h\nindex 780ae73cc..689aea451 100644\n--- a/examples/tep_termination/vxlan.h\n+++ b/examples/tep_termination/vxlan.h\n@@ -16,7 +16,7 @@\n #define VXLAN_HF_VNI 0x08000000\n #define DEFAULT_VXLAN_PORT 4789\n \n-extern struct ipv4_hdr app_ip_hdr[VXLAN_N_PORTS];\n+extern struct rte_ipv4_hdr app_ip_hdr[VXLAN_N_PORTS];\n extern struct rte_ether_hdr app_l2_hdr[VXLAN_N_PORTS];\n extern uint8_t tx_checksum;\n extern uint16_t tso_segsz;\ndiff --git a/examples/tep_termination/vxlan_setup.c b/examples/tep_termination/vxlan_setup.c\nindex 0b6b2d86e..b2c4155ee 100644\n--- a/examples/tep_termination/vxlan_setup.c\n+++ b/examples/tep_termination/vxlan_setup.c\n@@ -48,7 +48,7 @@\n /* VXLAN device */\n struct vxlan_conf vxdev;\n \n-struct ipv4_hdr app_ip_hdr[VXLAN_N_PORTS];\n+struct rte_ipv4_hdr app_ip_hdr[VXLAN_N_PORTS];\n struct rte_ether_hdr app_l2_hdr[VXLAN_N_PORTS];\n \n /* local VTEP IP address */\n@@ -229,7 +229,7 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m)\n \tint i, ret;\n \tstruct rte_ether_hdr *pkt_hdr;\n \tuint64_t portid = vdev->vid;\n-\tstruct ipv4_hdr *ip;\n+\tstruct rte_ipv4_hdr *ip;\n \n \tstruct rte_eth_tunnel_filter_conf tunnel_filter_conf;\n \ndiff --git a/examples/vhost/main.c b/examples/vhost/main.c\nindex cbd8e248d..ce14b100a 100644\n--- a/examples/vhost/main.c\n+++ b/examples/vhost/main.c\n@@ -864,7 +864,7 @@ get_psd_sum(void *l3_hdr, uint64_t ol_flags)\n static void virtio_tx_offload(struct rte_mbuf *m)\n {\n \tvoid *l3_hdr;\n-\tstruct ipv4_hdr *ipv4_hdr = NULL;\n+\tstruct rte_ipv4_hdr *ipv4_hdr = NULL;\n \tstruct tcp_hdr *tcp_hdr = NULL;\n \tstruct rte_ether_hdr *eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);\n \ndiff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h\nindex 56f129bd3..0bf55a62f 100644\n--- a/lib/librte_ethdev/rte_flow.h\n+++ b/lib/librte_ethdev/rte_flow.h\n@@ -629,7 +629,7 @@ static const struct rte_flow_item_vlan rte_flow_item_vlan_mask = {\n  * Note: IPv4 options are handled by dedicated pattern items.\n  */\n struct rte_flow_item_ipv4 {\n-\tstruct ipv4_hdr hdr; /**< IPv4 header definition. */\n+\tstruct rte_ipv4_hdr hdr; /**< IPv4 header definition. */\n };\n \n /** Default mask for RTE_FLOW_ITEM_TYPE_IPV4. */\n@@ -651,7 +651,7 @@ static const struct rte_flow_item_ipv4 rte_flow_item_ipv4_mask = {\n  * RTE_FLOW_ITEM_TYPE_IPV6_EXT.\n  */\n struct rte_flow_item_ipv6 {\n-\tstruct ipv6_hdr hdr; /**< IPv6 header definition. */\n+\tstruct rte_ipv6_hdr hdr; /**< IPv6 header definition. */\n };\n \n /** Default mask for RTE_FLOW_ITEM_TYPE_IPV6. */\ndiff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/librte_eventdev/rte_event_eth_rx_adapter.c\nindex 11d422573..bf9f98959 100644\n--- a/lib/librte_eventdev/rte_event_eth_rx_adapter.c\n+++ b/lib/librte_eventdev/rte_event_eth_rx_adapter.c\n@@ -611,8 +611,8 @@ rxa_calc_wrr_sequence(struct rte_event_eth_rx_adapter *rx_adapter,\n }\n \n static inline void\n-rxa_mtoip(struct rte_mbuf *m, struct ipv4_hdr **ipv4_hdr,\n-\tstruct ipv6_hdr **ipv6_hdr)\n+rxa_mtoip(struct rte_mbuf *m, struct rte_ipv4_hdr **ipv4_hdr,\n+\tstruct rte_ipv6_hdr **ipv6_hdr)\n {\n \tstruct rte_ether_hdr *eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);\n \tstruct rte_vlan_hdr *vlan_hdr;\n@@ -622,21 +622,21 @@ rxa_mtoip(struct rte_mbuf *m, struct ipv4_hdr **ipv4_hdr,\n \n \tswitch (eth_hdr->ether_type) {\n \tcase RTE_BE16(RTE_ETHER_TYPE_IPv4):\n-\t\t*ipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n+\t\t*ipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);\n \t\tbreak;\n \n \tcase RTE_BE16(RTE_ETHER_TYPE_IPv6):\n-\t\t*ipv6_hdr = (struct ipv6_hdr *)(eth_hdr + 1);\n+\t\t*ipv6_hdr = (struct rte_ipv6_hdr *)(eth_hdr + 1);\n \t\tbreak;\n \n \tcase RTE_BE16(RTE_ETHER_TYPE_VLAN):\n \t\tvlan_hdr = (struct rte_vlan_hdr *)(eth_hdr + 1);\n \t\tswitch (vlan_hdr->eth_proto) {\n \t\tcase RTE_BE16(RTE_ETHER_TYPE_IPv4):\n-\t\t\t*ipv4_hdr = (struct ipv4_hdr *)(vlan_hdr + 1);\n+\t\t\t*ipv4_hdr = (struct rte_ipv4_hdr *)(vlan_hdr + 1);\n \t\t\tbreak;\n \t\tcase RTE_BE16(RTE_ETHER_TYPE_IPv6):\n-\t\t\t*ipv6_hdr = (struct ipv6_hdr *)(vlan_hdr + 1);\n+\t\t\t*ipv6_hdr = (struct rte_ipv6_hdr *)(vlan_hdr + 1);\n \t\t\tbreak;\n \t\tdefault:\n \t\t\tbreak;\n@@ -656,8 +656,8 @@ rxa_do_softrss(struct rte_mbuf *m, const uint8_t *rss_key_be)\n \tvoid *tuple;\n \tstruct rte_ipv4_tuple ipv4_tuple;\n \tstruct rte_ipv6_tuple ipv6_tuple;\n-\tstruct ipv4_hdr *ipv4_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \n \trxa_mtoip(m, &ipv4_hdr, &ipv6_hdr);\n \ndiff --git a/lib/librte_gro/gro_tcp4.c b/lib/librte_gro/gro_tcp4.c\nindex 99c9c7d91..c37b4ef3e 100644\n--- a/lib/librte_gro/gro_tcp4.c\n+++ b/lib/librte_gro/gro_tcp4.c\n@@ -180,10 +180,10 @@ insert_new_flow(struct gro_tcp4_tbl *tbl,\n static inline void\n update_header(struct gro_tcp4_item *item)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tstruct rte_mbuf *pkt = item->firstseg;\n \n-\tipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n \t\t\tpkt->l2_len);\n \tipv4_hdr->total_length = rte_cpu_to_be_16(pkt->pkt_len -\n \t\t\tpkt->l2_len);\n@@ -195,7 +195,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,\n \t\tuint64_t start_time)\n {\n \tstruct rte_ether_hdr *eth_hdr;\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tstruct tcp_hdr *tcp_hdr;\n \tuint32_t sent_seq;\n \tint32_t tcp_dl;\n@@ -216,7 +216,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,\n \t\treturn -1;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);\n-\tipv4_hdr = (struct ipv4_hdr *)((char *)eth_hdr + pkt->l2_len);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)((char *)eth_hdr + pkt->l2_len);\n \ttcp_hdr = (struct tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len);\n \thdr_len = pkt->l2_len + pkt->l3_len + pkt->l4_len;\n \ndiff --git a/lib/librte_gro/gro_tcp4.h b/lib/librte_gro/gro_tcp4.h\nindex ce3471a4d..0a42a1ae8 100644\n--- a/lib/librte_gro/gro_tcp4.h\n+++ b/lib/librte_gro/gro_tcp4.h\n@@ -269,11 +269,11 @@ check_seq_option(struct gro_tcp4_item *item,\n \t\tuint8_t is_atomic)\n {\n \tstruct rte_mbuf *pkt_orig = item->firstseg;\n-\tstruct ipv4_hdr *iph_orig;\n+\tstruct rte_ipv4_hdr *iph_orig;\n \tstruct tcp_hdr *tcph_orig;\n \tuint16_t len, tcp_hl_orig;\n \n-\tiph_orig = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt_orig, char *) +\n+\tiph_orig = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt_orig, char *) +\n \t\t\tl2_offset + pkt_orig->l2_len);\n \ttcph_orig = (struct tcp_hdr *)((char *)iph_orig + pkt_orig->l3_len);\n \ttcp_hl_orig = pkt_orig->l4_len;\ndiff --git a/lib/librte_gro/gro_vxlan_tcp4.c b/lib/librte_gro/gro_vxlan_tcp4.c\nindex 53425f6d3..a9bdf1d72 100644\n--- a/lib/librte_gro/gro_vxlan_tcp4.c\n+++ b/lib/librte_gro/gro_vxlan_tcp4.c\n@@ -262,14 +262,14 @@ merge_two_vxlan_tcp4_packets(struct gro_vxlan_tcp4_item *item,\n static inline void\n update_vxlan_header(struct gro_vxlan_tcp4_item *item)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tstruct udp_hdr *udp_hdr;\n \tstruct rte_mbuf *pkt = item->inner_item.firstseg;\n \tuint16_t len;\n \n \t/* Update the outer IPv4 header. */\n \tlen = pkt->pkt_len - pkt->outer_l2_len;\n-\tipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n \t\t\tpkt->outer_l2_len);\n \tipv4_hdr->total_length = rte_cpu_to_be_16(len);\n \n@@ -280,7 +280,7 @@ update_vxlan_header(struct gro_vxlan_tcp4_item *item)\n \n \t/* Update the inner IPv4 header. */\n \tlen -= pkt->l2_len;\n-\tipv4_hdr = (struct ipv4_hdr *)((char *)udp_hdr + pkt->l2_len);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)((char *)udp_hdr + pkt->l2_len);\n \tipv4_hdr->total_length = rte_cpu_to_be_16(len);\n }\n \n@@ -290,7 +290,7 @@ gro_vxlan_tcp4_reassemble(struct rte_mbuf *pkt,\n \t\tuint64_t start_time)\n {\n \tstruct rte_ether_hdr *outer_eth_hdr, *eth_hdr;\n-\tstruct ipv4_hdr *outer_ipv4_hdr, *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *outer_ipv4_hdr, *ipv4_hdr;\n \tstruct tcp_hdr *tcp_hdr;\n \tstruct udp_hdr *udp_hdr;\n \tstruct rte_vxlan_hdr *vxlan_hdr;\n@@ -314,7 +314,7 @@ gro_vxlan_tcp4_reassemble(struct rte_mbuf *pkt,\n \t\treturn -1;\n \n \touter_eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);\n-\touter_ipv4_hdr = (struct ipv4_hdr *)((char *)outer_eth_hdr +\n+\touter_ipv4_hdr = (struct rte_ipv4_hdr *)((char *)outer_eth_hdr +\n \t\t\tpkt->outer_l2_len);\n \tudp_hdr = (struct udp_hdr *)((char *)outer_ipv4_hdr +\n \t\t\tpkt->outer_l3_len);\n@@ -322,7 +322,7 @@ gro_vxlan_tcp4_reassemble(struct rte_mbuf *pkt,\n \t\t\tsizeof(struct udp_hdr));\n \teth_hdr = (struct rte_ether_hdr *)((char *)vxlan_hdr +\n \t\t\tsizeof(struct rte_vxlan_hdr));\n-\tipv4_hdr = (struct ipv4_hdr *)((char *)udp_hdr + pkt->l2_len);\n+\tipv4_hdr = (struct rte_ipv4_hdr *)((char *)udp_hdr + pkt->l2_len);\n \ttcp_hdr = (struct tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len);\n \n \t/*\ndiff --git a/lib/librte_gso/gso_common.h b/lib/librte_gso/gso_common.h\nindex b6ff1b886..5f2adc833 100644\n--- a/lib/librte_gso/gso_common.h\n+++ b/lib/librte_gso/gso_common.h\n@@ -98,9 +98,9 @@ update_tcp_header(struct rte_mbuf *pkt, uint16_t l4_offset, uint32_t sent_seq,\n static inline void\n update_ipv4_header(struct rte_mbuf *pkt, uint16_t l3_offset, uint16_t id)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \n-\tipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n \t\t\tl3_offset);\n \tipv4_hdr->total_length = rte_cpu_to_be_16(pkt->pkt_len - l3_offset);\n \tipv4_hdr->packet_id = rte_cpu_to_be_16(id);\ndiff --git a/lib/librte_gso/gso_tcp4.c b/lib/librte_gso/gso_tcp4.c\nindex fbd95f8f6..ad0cce6f9 100644\n--- a/lib/librte_gso/gso_tcp4.c\n+++ b/lib/librte_gso/gso_tcp4.c\n@@ -9,14 +9,14 @@ static void\n update_ipv4_tcp_headers(struct rte_mbuf *pkt, uint8_t ipid_delta,\n \t\tstruct rte_mbuf **segs, uint16_t nb_segs)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tstruct tcp_hdr *tcp_hdr;\n \tuint32_t sent_seq;\n \tuint16_t id, tail_idx, i;\n \tuint16_t l3_offset = pkt->l2_len;\n \tuint16_t l4_offset = l3_offset + pkt->l3_len;\n \n-\tipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char*) +\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char*) +\n \t\t\tl3_offset);\n \ttcp_hdr = (struct tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len);\n \tid = rte_be_to_cpu_16(ipv4_hdr->packet_id);\n@@ -40,13 +40,13 @@ gso_tcp4_segment(struct rte_mbuf *pkt,\n \t\tstruct rte_mbuf **pkts_out,\n \t\tuint16_t nb_pkts_out)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tuint16_t pyld_unit_size, hdr_offset;\n \tuint16_t frag_off;\n \tint ret;\n \n \t/* Don't process the fragmented packet */\n-\tipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n \t\t\tpkt->l2_len);\n \tfrag_off = rte_be_to_cpu_16(ipv4_hdr->fragment_offset);\n \tif (unlikely(IS_FRAGMENTED(frag_off))) {\ndiff --git a/lib/librte_gso/gso_tunnel_tcp4.c b/lib/librte_gso/gso_tunnel_tcp4.c\nindex d39b46863..f5a19bc43 100644\n--- a/lib/librte_gso/gso_tunnel_tcp4.c\n+++ b/lib/librte_gso/gso_tunnel_tcp4.c\n@@ -9,7 +9,7 @@ static void\n update_tunnel_ipv4_tcp_headers(struct rte_mbuf *pkt, uint8_t ipid_delta,\n \t\tstruct rte_mbuf **segs, uint16_t nb_segs)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tstruct tcp_hdr *tcp_hdr;\n \tuint32_t sent_seq;\n \tuint16_t outer_id, inner_id, tail_idx, i;\n@@ -23,12 +23,12 @@ update_tunnel_ipv4_tcp_headers(struct rte_mbuf *pkt, uint8_t ipid_delta,\n \ttcp_offset = inner_ipv4_offset + pkt->l3_len;\n \n \t/* Outer IPv4 header. */\n-\tipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n \t\t\touter_ipv4_offset);\n \touter_id = rte_be_to_cpu_16(ipv4_hdr->packet_id);\n \n \t/* Inner IPv4 header. */\n-\tipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n+\tipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n \t\t\tinner_ipv4_offset);\n \tinner_id = rte_be_to_cpu_16(ipv4_hdr->packet_id);\n \n@@ -60,12 +60,12 @@ gso_tunnel_tcp4_segment(struct rte_mbuf *pkt,\n \t\tstruct rte_mbuf **pkts_out,\n \t\tuint16_t nb_pkts_out)\n {\n-\tstruct ipv4_hdr *inner_ipv4_hdr;\n+\tstruct rte_ipv4_hdr *inner_ipv4_hdr;\n \tuint16_t pyld_unit_size, hdr_offset, frag_off;\n \tint ret = 1;\n \n \thdr_offset = pkt->outer_l2_len + pkt->outer_l3_len + pkt->l2_len;\n-\tinner_ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n+\tinner_ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +\n \t\t\thdr_offset);\n \t/*\n \t * Don't process the packet whose MF bit or offset in the inner\ndiff --git a/lib/librte_gso/gso_udp4.c b/lib/librte_gso/gso_udp4.c\nindex 927dee121..93e6f8e0d 100644\n--- a/lib/librte_gso/gso_udp4.c\n+++ b/lib/librte_gso/gso_udp4.c\n@@ -11,7 +11,7 @@ static inline void\n update_ipv4_udp_headers(struct rte_mbuf *pkt, struct rte_mbuf **segs,\n \t\tuint16_t nb_segs)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tuint16_t frag_offset = 0, is_mf;\n \tuint16_t l2_hdrlen = pkt->l2_len, l3_hdrlen = pkt->l3_len;\n \tuint16_t tail_idx = nb_segs - 1, length, i;\n@@ -22,7 +22,7 @@ update_ipv4_udp_headers(struct rte_mbuf *pkt, struct rte_mbuf **segs,\n \t * length.\n \t */\n \tfor (i = 0; i < nb_segs; i++) {\n-\t\tipv4_hdr = rte_pktmbuf_mtod_offset(segs[i], struct ipv4_hdr *,\n+\t\tipv4_hdr = rte_pktmbuf_mtod_offset(segs[i], struct rte_ipv4_hdr *,\n \t\t\tl2_hdrlen);\n \t\tlength = segs[i]->pkt_len - l2_hdrlen;\n \t\tipv4_hdr->total_length = rte_cpu_to_be_16(length);\n@@ -42,13 +42,13 @@ gso_udp4_segment(struct rte_mbuf *pkt,\n \t\tstruct rte_mbuf **pkts_out,\n \t\tuint16_t nb_pkts_out)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n \tuint16_t pyld_unit_size, hdr_offset;\n \tuint16_t frag_off;\n \tint ret;\n \n \t/* Don't process the fragmented packet */\n-\tipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct ipv4_hdr *,\n+\tipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,\n \t\t\tpkt->l2_len);\n \tfrag_off = rte_be_to_cpu_16(ipv4_hdr->fragment_offset);\n \tif (unlikely(IS_FRAGMENTED(frag_off))) {\ndiff --git a/lib/librte_gso/rte_gso.h b/lib/librte_gso/rte_gso.h\nindex 433f2c8bb..ee879968c 100644\n--- a/lib/librte_gso/rte_gso.h\n+++ b/lib/librte_gso/rte_gso.h\n@@ -19,11 +19,11 @@ extern \"C\" {\n \n /* Minimum GSO segment size for TCP based packets. */\n #define RTE_GSO_SEG_SIZE_MIN (sizeof(struct rte_ether_hdr) + \\\n-\t\tsizeof(struct ipv4_hdr) + sizeof(struct tcp_hdr) + 1)\n+\t\tsizeof(struct rte_ipv4_hdr) + sizeof(struct tcp_hdr) + 1)\n \n /* Minimum GSO segment size for UDP based packets. */\n #define RTE_GSO_UDP_SEG_SIZE_MIN (sizeof(struct rte_ether_hdr) + \\\n-\t\tsizeof(struct ipv4_hdr) + sizeof(struct udp_hdr) + 1)\n+\t\tsizeof(struct rte_ipv4_hdr) + sizeof(struct udp_hdr) + 1)\n \n /* GSO flags for rte_gso_ctx. */\n #define RTE_GSO_FLAG_IPID_FIXED (1ULL << 0)\ndiff --git a/lib/librte_hash/rte_thash.h b/lib/librte_hash/rte_thash.h\nindex 1b33f4813..b27bf24d3 100644\n--- a/lib/librte_hash/rte_thash.h\n+++ b/lib/librte_hash/rte_thash.h\n@@ -139,7 +139,7 @@ rte_convert_rss_key(const uint32_t *orig, uint32_t *targ, int len)\n  *   Pointer to rte_ipv6_tuple structure\n  */\n static inline void\n-rte_thash_load_v6_addrs(const struct ipv6_hdr *orig, union rte_thash_tuple *targ)\n+rte_thash_load_v6_addrs(const struct rte_ipv6_hdr *orig, union rte_thash_tuple *targ)\n {\n #ifdef RTE_ARCH_X86\n \t__m128i ipv6 = _mm_loadu_si128((const __m128i *)orig->src_addr);\ndiff --git a/lib/librte_ip_frag/rte_ip_frag.h b/lib/librte_ip_frag/rte_ip_frag.h\nindex 04fd9df52..60c0300e8 100644\n--- a/lib/librte_ip_frag/rte_ip_frag.h\n+++ b/lib/librte_ip_frag/rte_ip_frag.h\n@@ -219,7 +219,7 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,\n  */\n struct rte_mbuf *rte_ipv6_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,\n \t\tstruct rte_ip_frag_death_row *dr,\n-\t\tstruct rte_mbuf *mb, uint64_t tms, struct ipv6_hdr *ip_hdr,\n+\t\tstruct rte_mbuf *mb, uint64_t tms, struct rte_ipv6_hdr *ip_hdr,\n \t\tstruct ipv6_extension_fragment *frag_hdr);\n \n /**\n@@ -234,7 +234,7 @@ struct rte_mbuf *rte_ipv6_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,\n  *   present.\n  */\n static inline struct ipv6_extension_fragment *\n-rte_ipv6_frag_get_ipv6_fragment_header(struct ipv6_hdr *hdr)\n+rte_ipv6_frag_get_ipv6_fragment_header(struct rte_ipv6_hdr *hdr)\n {\n \tif (hdr->proto == IPPROTO_FRAGMENT) {\n \t\treturn (struct ipv6_extension_fragment *) ++hdr;\n@@ -293,7 +293,7 @@ int32_t rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,\n  */\n struct rte_mbuf * rte_ipv4_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,\n \t\tstruct rte_ip_frag_death_row *dr,\n-\t\tstruct rte_mbuf *mb, uint64_t tms, struct ipv4_hdr *ip_hdr);\n+\t\tstruct rte_mbuf *mb, uint64_t tms, struct rte_ipv4_hdr *ip_hdr);\n \n /**\n  * Check if the IPv4 packet is fragmented\n@@ -304,7 +304,7 @@ struct rte_mbuf * rte_ipv4_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,\n  *   1 if fragmented, 0 if not fragmented\n  */\n static inline int\n-rte_ipv4_frag_pkt_is_fragmented(const struct ipv4_hdr * hdr) {\n+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);\ndiff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/librte_ip_frag/rte_ipv4_fragmentation.c\nindex a96fb03e4..2c781724a 100644\n--- a/lib/librte_ip_frag/rte_ipv4_fragmentation.c\n+++ b/lib/librte_ip_frag/rte_ipv4_fragmentation.c\n@@ -21,8 +21,8 @@\n \n #define\tIPV4_HDR_FO_ALIGN\t\t\t(1 << IPV4_HDR_FO_SHIFT)\n \n-static inline void __fill_ipv4hdr_frag(struct ipv4_hdr *dst,\n-\t\tconst struct ipv4_hdr *src, uint16_t len, uint16_t fofs,\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@@ -70,7 +70,7 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,\n \tstruct rte_mempool *pool_indirect)\n {\n \tstruct rte_mbuf *in_seg = NULL;\n-\tstruct ipv4_hdr *in_hdr;\n+\tstruct rte_ipv4_hdr *in_hdr;\n \tuint32_t out_pkt_pos, in_seg_data_pos;\n \tuint32_t more_in_segs;\n \tuint16_t fragment_offset, flag_offset, frag_size;\n@@ -80,10 +80,10 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,\n \t * Ensure the IP payload length of all fragments is aligned to a\n \t * multiple of 8 bytes as per RFC791 section 2.3.\n \t */\n-\tfrag_size = RTE_ALIGN_FLOOR((mtu_size - sizeof(struct ipv4_hdr)),\n+\tfrag_size = RTE_ALIGN_FLOOR((mtu_size - sizeof(struct rte_ipv4_hdr)),\n \t\t\t\t    IPV4_HDR_FO_ALIGN);\n \n-\tin_hdr = rte_pktmbuf_mtod(pkt_in, struct ipv4_hdr *);\n+\tin_hdr = rte_pktmbuf_mtod(pkt_in, struct rte_ipv4_hdr *);\n \tflag_offset = rte_cpu_to_be_16(in_hdr->fragment_offset);\n \n \t/* If Don't Fragment flag is set */\n@@ -92,11 +92,11 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,\n \n \t/* Check that pkts_out is big enough to hold all fragments */\n \tif (unlikely(frag_size * nb_pkts_out <\n-\t    (uint16_t)(pkt_in->pkt_len - sizeof (struct ipv4_hdr))))\n+\t    (uint16_t)(pkt_in->pkt_len - sizeof (struct rte_ipv4_hdr))))\n \t\treturn -EINVAL;\n \n \tin_seg = pkt_in;\n-\tin_seg_data_pos = sizeof(struct ipv4_hdr);\n+\tin_seg_data_pos = sizeof(struct rte_ipv4_hdr);\n \tout_pkt_pos = 0;\n \tfragment_offset = 0;\n \n@@ -104,7 +104,7 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,\n \twhile (likely(more_in_segs)) {\n \t\tstruct rte_mbuf *out_pkt = NULL, *out_seg_prev = NULL;\n \t\tuint32_t more_out_segs;\n-\t\tstruct ipv4_hdr *out_hdr;\n+\t\tstruct rte_ipv4_hdr *out_hdr;\n \n \t\t/* Allocate direct buffer */\n \t\tout_pkt = rte_pktmbuf_alloc(pool_direct);\n@@ -114,8 +114,8 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,\n \t\t}\n \n \t\t/* Reserve space for the IP header that will be built later */\n-\t\tout_pkt->data_len = sizeof(struct ipv4_hdr);\n-\t\tout_pkt->pkt_len = sizeof(struct ipv4_hdr);\n+\t\tout_pkt->data_len = sizeof(struct rte_ipv4_hdr);\n+\t\tout_pkt->pkt_len = sizeof(struct rte_ipv4_hdr);\n \t\tfrag_bytes_remaining = frag_size;\n \n \t\tout_seg_prev = out_pkt;\n@@ -164,17 +164,17 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,\n \n \t\t/* Build the IP header */\n \n-\t\tout_hdr = rte_pktmbuf_mtod(out_pkt, struct ipv4_hdr *);\n+\t\tout_hdr = rte_pktmbuf_mtod(out_pkt, struct rte_ipv4_hdr *);\n \n \t\t__fill_ipv4hdr_frag(out_hdr, in_hdr,\n \t\t    (uint16_t)out_pkt->pkt_len,\n \t\t    flag_offset, fragment_offset, more_in_segs);\n \n \t\tfragment_offset = (uint16_t)(fragment_offset +\n-\t\t    out_pkt->pkt_len - sizeof(struct ipv4_hdr));\n+\t\t    out_pkt->pkt_len - sizeof(struct rte_ipv4_hdr));\n \n \t\tout_pkt->ol_flags |= PKT_TX_IP_CKSUM;\n-\t\tout_pkt->l3_len = sizeof(struct ipv4_hdr);\n+\t\tout_pkt->l3_len = sizeof(struct rte_ipv4_hdr);\n \n \t\t/* Write the fragment to the output list */\n \t\tpkts_out[out_pkt_pos] = out_pkt;\ndiff --git a/lib/librte_ip_frag/rte_ipv4_reassembly.c b/lib/librte_ip_frag/rte_ipv4_reassembly.c\nindex 1029b7abc..97da607ed 100644\n--- a/lib/librte_ip_frag/rte_ipv4_reassembly.c\n+++ b/lib/librte_ip_frag/rte_ipv4_reassembly.c\n@@ -14,7 +14,7 @@\n struct rte_mbuf *\n ipv4_frag_reassemble(struct ip_frag_pkt *fp)\n {\n-\tstruct ipv4_hdr *ip_hdr;\n+\tstruct rte_ipv4_hdr *ip_hdr;\n \tstruct rte_mbuf *m, *prev;\n \tuint32_t i, n, ofs, first_len;\n \tuint32_t curr_idx = 0;\n@@ -70,7 +70,7 @@ ipv4_frag_reassemble(struct ip_frag_pkt *fp)\n \tm->ol_flags |= PKT_TX_IP_CKSUM;\n \n \t/* update ipv4 header for the reassembled packet */\n-\tip_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *, m->l2_len);\n+\tip_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *, m->l2_len);\n \n \tip_hdr->total_length = rte_cpu_to_be_16((uint16_t)(fp->total_size +\n \t\tm->l3_len));\n@@ -100,7 +100,7 @@ ipv4_frag_reassemble(struct ip_frag_pkt *fp)\n struct rte_mbuf *\n rte_ipv4_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,\n \tstruct rte_ip_frag_death_row *dr, struct rte_mbuf *mb, uint64_t tms,\n-\tstruct ipv4_hdr *ip_hdr)\n+\tstruct rte_ipv4_hdr *ip_hdr)\n {\n \tstruct ip_frag_pkt *fp;\n \tstruct ip_frag_key key;\ndiff --git a/lib/librte_ip_frag/rte_ipv6_fragmentation.c b/lib/librte_ip_frag/rte_ipv6_fragmentation.c\nindex b9437eb11..875f86faa 100644\n--- a/lib/librte_ip_frag/rte_ipv6_fragmentation.c\n+++ b/lib/librte_ip_frag/rte_ipv6_fragmentation.c\n@@ -18,8 +18,8 @@\n  */\n \n static inline void\n-__fill_ipv6hdr_frag(struct ipv6_hdr *dst,\n-\t\tconst struct ipv6_hdr *src, uint16_t len, uint16_t fofs,\n+__fill_ipv6hdr_frag(struct rte_ipv6_hdr *dst,\n+\t\tconst struct rte_ipv6_hdr *src, uint16_t len, uint16_t fofs,\n \t\tuint32_t mf)\n {\n \tstruct ipv6_extension_fragment *fh;\n@@ -73,7 +73,7 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,\n \tstruct rte_mempool *pool_indirect)\n {\n \tstruct rte_mbuf *in_seg = NULL;\n-\tstruct ipv6_hdr *in_hdr;\n+\tstruct rte_ipv6_hdr *in_hdr;\n \tuint32_t out_pkt_pos, in_seg_data_pos;\n \tuint32_t more_in_segs;\n \tuint16_t fragment_offset, frag_size;\n@@ -83,18 +83,18 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,\n \t * Ensure the IP payload length of all fragments (except the\n \t * the last fragment) are a multiple of 8 bytes per RFC2460.\n \t */\n-\tfrag_size = RTE_ALIGN_FLOOR(mtu_size - sizeof(struct ipv6_hdr),\n+\tfrag_size = RTE_ALIGN_FLOOR(mtu_size - sizeof(struct rte_ipv6_hdr),\n \t\t\t\t    RTE_IPV6_EHDR_FO_ALIGN);\n \n \t/* Check that pkts_out is big enough to hold all fragments */\n \tif (unlikely (frag_size * nb_pkts_out <\n-\t    (uint16_t)(pkt_in->pkt_len - sizeof (struct ipv6_hdr))))\n+\t    (uint16_t)(pkt_in->pkt_len - sizeof (struct rte_ipv6_hdr))))\n \t\treturn -EINVAL;\n \n-\tin_hdr = rte_pktmbuf_mtod(pkt_in, struct ipv6_hdr *);\n+\tin_hdr = rte_pktmbuf_mtod(pkt_in, struct rte_ipv6_hdr *);\n \n \tin_seg = pkt_in;\n-\tin_seg_data_pos = sizeof(struct ipv6_hdr);\n+\tin_seg_data_pos = sizeof(struct rte_ipv6_hdr);\n \tout_pkt_pos = 0;\n \tfragment_offset = 0;\n \n@@ -102,7 +102,7 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,\n \twhile (likely(more_in_segs)) {\n \t\tstruct rte_mbuf *out_pkt = NULL, *out_seg_prev = NULL;\n \t\tuint32_t more_out_segs;\n-\t\tstruct ipv6_hdr *out_hdr;\n+\t\tstruct rte_ipv6_hdr *out_hdr;\n \n \t\t/* Allocate direct buffer */\n \t\tout_pkt = rte_pktmbuf_alloc(pool_direct);\n@@ -112,8 +112,8 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,\n \t\t}\n \n \t\t/* Reserve space for the IP header that will be built later */\n-\t\tout_pkt->data_len = sizeof(struct ipv6_hdr) + sizeof(struct ipv6_extension_fragment);\n-\t\tout_pkt->pkt_len  = sizeof(struct ipv6_hdr) + sizeof(struct ipv6_extension_fragment);\n+\t\tout_pkt->data_len = sizeof(struct rte_ipv6_hdr) + sizeof(struct ipv6_extension_fragment);\n+\t\tout_pkt->pkt_len  = sizeof(struct rte_ipv6_hdr) + sizeof(struct ipv6_extension_fragment);\n \t\tfrag_bytes_remaining = frag_size;\n \n \t\tout_seg_prev = out_pkt;\n@@ -163,14 +163,14 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,\n \n \t\t/* Build the IP header */\n \n-\t\tout_hdr = rte_pktmbuf_mtod(out_pkt, struct ipv6_hdr *);\n+\t\tout_hdr = rte_pktmbuf_mtod(out_pkt, struct rte_ipv6_hdr *);\n \n \t\t__fill_ipv6hdr_frag(out_hdr, in_hdr,\n-\t\t    (uint16_t) out_pkt->pkt_len - sizeof(struct ipv6_hdr),\n+\t\t    (uint16_t) out_pkt->pkt_len - sizeof(struct rte_ipv6_hdr),\n \t\t    fragment_offset, more_in_segs);\n \n \t\tfragment_offset = (uint16_t)(fragment_offset +\n-\t\t    out_pkt->pkt_len - sizeof(struct ipv6_hdr)\n+\t\t    out_pkt->pkt_len - sizeof(struct rte_ipv6_hdr)\n \t\t\t- sizeof(struct ipv6_extension_fragment));\n \n \t\t/* Write the fragment to the output list */\ndiff --git a/lib/librte_ip_frag/rte_ipv6_reassembly.c b/lib/librte_ip_frag/rte_ipv6_reassembly.c\nindex 855e3f740..169b01a5d 100644\n--- a/lib/librte_ip_frag/rte_ipv6_reassembly.c\n+++ b/lib/librte_ip_frag/rte_ipv6_reassembly.c\n@@ -32,7 +32,7 @@ ip_frag_memmove(char *dst, char *src, int len)\n struct rte_mbuf *\n ipv6_frag_reassemble(struct ip_frag_pkt *fp)\n {\n-\tstruct ipv6_hdr *ip_hdr;\n+\tstruct rte_ipv6_hdr *ip_hdr;\n \tstruct ipv6_extension_fragment *frag_hdr;\n \tstruct rte_mbuf *m, *prev;\n \tuint32_t i, n, ofs, first_len;\n@@ -93,7 +93,7 @@ ipv6_frag_reassemble(struct ip_frag_pkt *fp)\n \tm->ol_flags |= PKT_TX_IP_CKSUM;\n \n \t/* update ipv6 header for the reassembled datagram */\n-\tip_hdr = rte_pktmbuf_mtod_offset(m, struct ipv6_hdr *, m->l2_len);\n+\tip_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv6_hdr *, m->l2_len);\n \n \tip_hdr->payload_len = rte_cpu_to_be_16(payload_len);\n \n@@ -139,7 +139,7 @@ ipv6_frag_reassemble(struct ip_frag_pkt *fp)\n struct rte_mbuf *\n rte_ipv6_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,\n \tstruct rte_ip_frag_death_row *dr, struct rte_mbuf *mb, uint64_t tms,\n-\tstruct ipv6_hdr *ip_hdr, struct ipv6_extension_fragment *frag_hdr)\n+\tstruct rte_ipv6_hdr *ip_hdr, struct ipv6_extension_fragment *frag_hdr)\n {\n \tstruct ip_frag_pkt *fp;\n \tstruct ip_frag_key key;\ndiff --git a/lib/librte_ipsec/iph.h b/lib/librte_ipsec/iph.h\nindex 58930cf18..a0ca41d51 100644\n--- a/lib/librte_ipsec/iph.h\n+++ b/lib/librte_ipsec/iph.h\n@@ -40,8 +40,8 @@ static inline int\n update_trs_l3hdr(const struct rte_ipsec_sa *sa, void *p, uint32_t plen,\n \t\tuint32_t l2len, uint32_t l3len, uint8_t proto)\n {\n-\tstruct ipv4_hdr *v4h;\n-\tstruct ipv6_hdr *v6h;\n+\tstruct rte_ipv4_hdr *v4h;\n+\tstruct rte_ipv6_hdr *v6h;\n \tint32_t rc;\n \n \tif ((sa->type & RTE_IPSEC_SATP_IPV_MASK) == RTE_IPSEC_SATP_IPV4) {\n@@ -67,8 +67,8 @@ static inline void\n update_tun_l3hdr(const struct rte_ipsec_sa *sa, void *p, uint32_t plen,\n \t\tuint32_t l2len, rte_be16_t pid)\n {\n-\tstruct ipv4_hdr *v4h;\n-\tstruct ipv6_hdr *v6h;\n+\tstruct rte_ipv4_hdr *v4h;\n+\tstruct rte_ipv6_hdr *v6h;\n \n \tif (sa->type & RTE_IPSEC_SATP_MODE_TUNLV4) {\n \t\tv4h = p;\ndiff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h\nindex f9b909090..a1431ee90 100644\n--- a/lib/librte_net/rte_ip.h\n+++ b/lib/librte_net/rte_ip.h\n@@ -28,7 +28,7 @@ extern \"C\" {\n /**\n  * IPv4 Header\n  */\n-struct ipv4_hdr {\n+struct rte_ipv4_hdr {\n \tuint8_t  version_ihl;\t\t/**< version and header length */\n \tuint8_t  type_of_service;\t/**< type of service */\n \tuint16_t total_length;\t\t/**< length of packet */\n@@ -249,10 +249,10 @@ rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len,\n  *   The complemented checksum to set in the IP packet.\n  */\n static inline uint16_t\n-rte_ipv4_cksum(const struct ipv4_hdr *ipv4_hdr)\n+rte_ipv4_cksum(const struct rte_ipv4_hdr *ipv4_hdr)\n {\n \tuint16_t cksum;\n-\tcksum = rte_raw_cksum(ipv4_hdr, sizeof(struct ipv4_hdr));\n+\tcksum = rte_raw_cksum(ipv4_hdr, sizeof(struct rte_ipv4_hdr));\n \treturn (cksum == 0xffff) ? cksum : (uint16_t)~cksum;\n }\n \n@@ -275,7 +275,7 @@ rte_ipv4_cksum(const struct ipv4_hdr *ipv4_hdr)\n  *   The non-complemented checksum to set in the L4 header.\n  */\n static inline uint16_t\n-rte_ipv4_phdr_cksum(const struct ipv4_hdr *ipv4_hdr, uint64_t ol_flags)\n+rte_ipv4_phdr_cksum(const struct rte_ipv4_hdr *ipv4_hdr, uint64_t ol_flags)\n {\n \tstruct ipv4_psd_header {\n \t\tuint32_t src_addr; /* IP address of source host. */\n@@ -294,7 +294,7 @@ rte_ipv4_phdr_cksum(const struct ipv4_hdr *ipv4_hdr, uint64_t ol_flags)\n \t} else {\n \t\tpsd_hdr.len = rte_cpu_to_be_16(\n \t\t\t(uint16_t)(rte_be_to_cpu_16(ipv4_hdr->total_length)\n-\t\t\t\t- sizeof(struct ipv4_hdr)));\n+\t\t\t\t- sizeof(struct rte_ipv4_hdr)));\n \t}\n \treturn rte_raw_cksum(&psd_hdr, sizeof(psd_hdr));\n }\n@@ -314,16 +314,16 @@ rte_ipv4_phdr_cksum(const struct ipv4_hdr *ipv4_hdr, uint64_t ol_flags)\n  *   or 0 on error\n  */\n static inline uint16_t\n-rte_ipv4_udptcp_cksum(const struct ipv4_hdr *ipv4_hdr, const void *l4_hdr)\n+rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr)\n {\n \tuint32_t cksum;\n \tuint32_t l3_len, l4_len;\n \n \tl3_len = rte_be_to_cpu_16(ipv4_hdr->total_length);\n-\tif (l3_len < sizeof(struct ipv4_hdr))\n+\tif (l3_len < sizeof(struct rte_ipv4_hdr))\n \t\treturn 0;\n \n-\tl4_len = l3_len - sizeof(struct ipv4_hdr);\n+\tl4_len = l3_len - sizeof(struct rte_ipv4_hdr);\n \n \tcksum = rte_raw_cksum(l4_hdr, l4_len);\n \tcksum += rte_ipv4_phdr_cksum(ipv4_hdr, 0);\n@@ -339,7 +339,7 @@ rte_ipv4_udptcp_cksum(const struct ipv4_hdr *ipv4_hdr, const void *l4_hdr)\n /**\n  * IPv6 Header\n  */\n-struct ipv6_hdr {\n+struct rte_ipv6_hdr {\n \tuint32_t vtc_flow;     /**< IP version, traffic class & flow label. */\n \tuint16_t payload_len;  /**< IP packet length - includes sizeof(ip_header). */\n \tuint8_t  proto;        /**< Protocol, next header. */\n@@ -371,7 +371,7 @@ struct ipv6_hdr {\n  *   The non-complemented checksum to set in the L4 header.\n  */\n static inline uint16_t\n-rte_ipv6_phdr_cksum(const struct ipv6_hdr *ipv6_hdr, uint64_t ol_flags)\n+rte_ipv6_phdr_cksum(const struct rte_ipv6_hdr *ipv6_hdr, uint64_t ol_flags)\n {\n \tuint32_t sum;\n \tstruct {\n@@ -407,7 +407,7 @@ rte_ipv6_phdr_cksum(const struct ipv6_hdr *ipv6_hdr, uint64_t ol_flags)\n  *   The complemented checksum to set in the IP packet.\n  */\n static inline uint16_t\n-rte_ipv6_udptcp_cksum(const struct ipv6_hdr *ipv6_hdr, const void *l4_hdr)\n+rte_ipv6_udptcp_cksum(const struct rte_ipv6_hdr *ipv6_hdr, const void *l4_hdr)\n {\n \tuint32_t cksum;\n \tuint32_t l4_len;\ndiff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c\nindex d858ab155..b01cacb9c 100644\n--- a/lib/librte_net/rte_net.c\n+++ b/lib/librte_net/rte_net.c\n@@ -173,7 +173,7 @@ ptype_tunnel(uint16_t *proto, const struct rte_mbuf *m,\n \n /* get the ipv4 header length */\n static uint8_t\n-ip4_hlen(const struct ipv4_hdr *hdr)\n+ip4_hlen(const struct rte_ipv4_hdr *hdr)\n {\n \treturn (hdr->version_ihl & 0xf) * 4;\n }\n@@ -300,8 +300,8 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m,\n \t\treturn pkt_type;\n \n \tif (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) {\n-\t\tconst struct ipv4_hdr *ip4h;\n-\t\tstruct ipv4_hdr ip4h_copy;\n+\t\tconst struct rte_ipv4_hdr *ip4h;\n+\t\tstruct rte_ipv4_hdr ip4h_copy;\n \n \t\tip4h = rte_pktmbuf_read(m, off, sizeof(*ip4h), &ip4h_copy);\n \t\tif (unlikely(ip4h == NULL))\n@@ -323,8 +323,8 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m,\n \t\tproto = ip4h->next_proto_id;\n \t\tpkt_type |= ptype_l4(proto);\n \t} else if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) {\n-\t\tconst struct ipv6_hdr *ip6h;\n-\t\tstruct ipv6_hdr ip6h_copy;\n+\t\tconst struct rte_ipv6_hdr *ip6h;\n+\t\tstruct rte_ipv6_hdr ip6h_copy;\n \t\tint frag = 0;\n \n \t\tip6h = rte_pktmbuf_read(m, off, sizeof(*ip6h), &ip6h_copy);\n@@ -432,8 +432,8 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m,\n \t\treturn pkt_type;\n \n \tif (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) {\n-\t\tconst struct ipv4_hdr *ip4h;\n-\t\tstruct ipv4_hdr ip4h_copy;\n+\t\tconst struct rte_ipv4_hdr *ip4h;\n+\t\tstruct rte_ipv4_hdr ip4h_copy;\n \n \t\tip4h = rte_pktmbuf_read(m, off, sizeof(*ip4h), &ip4h_copy);\n \t\tif (unlikely(ip4h == NULL))\n@@ -455,8 +455,8 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m,\n \t\tproto = ip4h->next_proto_id;\n \t\tpkt_type |= ptype_inner_l4(proto);\n \t} else if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) {\n-\t\tconst struct ipv6_hdr *ip6h;\n-\t\tstruct ipv6_hdr ip6h_copy;\n+\t\tconst struct rte_ipv6_hdr *ip6h;\n+\t\tstruct rte_ipv6_hdr ip6h_copy;\n \t\tint frag = 0;\n \n \t\tip6h = rte_pktmbuf_read(m, off, sizeof(*ip6h), &ip6h_copy);\ndiff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h\nindex 16970711b..5c9a37a94 100644\n--- a/lib/librte_net/rte_net.h\n+++ b/lib/librte_net/rte_net.h\n@@ -112,8 +112,8 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m,\n static inline int\n rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \tstruct tcp_hdr *tcp_hdr;\n \tstruct udp_hdr *udp_hdr;\n \tuint64_t inner_l3_offset = m->l2_len;\n@@ -144,7 +144,7 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)\n #endif\n \n \tif (ol_flags & PKT_TX_IPV4) {\n-\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,\n+\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *,\n \t\t\t\tinner_l3_offset);\n \n \t\tif (ol_flags & PKT_TX_IP_CKSUM)\n@@ -158,7 +158,7 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)\n \t\t\tudp_hdr->dgram_cksum = rte_ipv4_phdr_cksum(ipv4_hdr,\n \t\t\t\t\tol_flags);\n \t\t} else {\n-\t\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct ipv6_hdr *,\n+\t\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv6_hdr *,\n \t\t\t\t\tinner_l3_offset);\n \t\t\t/* non-TSO udp */\n \t\t\tudp_hdr = rte_pktmbuf_mtod_offset(m, struct udp_hdr *,\n@@ -175,7 +175,7 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)\n \t\t\ttcp_hdr->cksum = rte_ipv4_phdr_cksum(ipv4_hdr,\n \t\t\t\t\tol_flags);\n \t\t} else {\n-\t\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct ipv6_hdr *,\n+\t\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv6_hdr *,\n \t\t\t\t\tinner_l3_offset);\n \t\t\t/* non-TSO tcp or TSO */\n \t\t\ttcp_hdr = rte_pktmbuf_mtod_offset(m, struct tcp_hdr *,\ndiff --git a/lib/librte_pipeline/rte_table_action.c b/lib/librte_pipeline/rte_table_action.c\nindex 224045e8a..682df6cc4 100644\n--- a/lib/librte_pipeline/rte_table_action.c\n+++ b/lib/librte_pipeline/rte_table_action.c\n@@ -491,7 +491,7 @@ struct encap_pppoe_data {\n \n struct encap_vxlan_ipv4_data {\n \tstruct rte_ether_hdr ether;\n-\tstruct ipv4_hdr ipv4;\n+\tstruct rte_ipv4_hdr ipv4;\n \tstruct udp_hdr udp;\n \tstruct rte_vxlan_hdr vxlan;\n } __attribute__((__packed__));\n@@ -499,14 +499,14 @@ struct encap_vxlan_ipv4_data {\n struct encap_vxlan_ipv4_vlan_data {\n \tstruct rte_ether_hdr ether;\n \tstruct rte_vlan_hdr vlan;\n-\tstruct ipv4_hdr ipv4;\n+\tstruct rte_ipv4_hdr ipv4;\n \tstruct udp_hdr udp;\n \tstruct rte_vxlan_hdr vxlan;\n } __attribute__((__packed__));\n \n struct encap_vxlan_ipv6_data {\n \tstruct rte_ether_hdr ether;\n-\tstruct ipv6_hdr ipv6;\n+\tstruct rte_ipv6_hdr ipv6;\n \tstruct udp_hdr udp;\n \tstruct rte_vxlan_hdr vxlan;\n } __attribute__((__packed__));\n@@ -514,7 +514,7 @@ struct encap_vxlan_ipv6_data {\n struct encap_vxlan_ipv6_vlan_data {\n \tstruct rte_ether_hdr ether;\n \tstruct rte_vlan_hdr vlan;\n-\tstruct ipv6_hdr ipv6;\n+\tstruct rte_ipv6_hdr ipv6;\n \tstruct udp_hdr udp;\n \tstruct rte_vxlan_hdr vxlan;\n } __attribute__((__packed__));\n@@ -999,7 +999,7 @@ pkt_work_encap_vxlan_ipv4(struct rte_mbuf *mbuf,\n \tipv4_total_length = ether_length +\n \t\t(sizeof(struct rte_vxlan_hdr) +\n \t\tsizeof(struct udp_hdr) +\n-\t\tsizeof(struct ipv4_hdr));\n+\t\tsizeof(struct rte_ipv4_hdr));\n \tipv4_hdr_cksum = encap_vxlan_ipv4_checksum_update(vxlan_tbl->ipv4.hdr_checksum,\n \t\trte_htons(ipv4_total_length));\n \tudp_length = ether_length +\n@@ -1029,7 +1029,7 @@ pkt_work_encap_vxlan_ipv4_vlan(struct rte_mbuf *mbuf,\n \tipv4_total_length = ether_length +\n \t\t(sizeof(struct rte_vxlan_hdr) +\n \t\tsizeof(struct udp_hdr) +\n-\t\tsizeof(struct ipv4_hdr));\n+\t\tsizeof(struct rte_ipv4_hdr));\n \tipv4_hdr_cksum = encap_vxlan_ipv4_checksum_update(vxlan_tbl->ipv4.hdr_checksum,\n \t\trte_htons(ipv4_total_length));\n \tudp_length = ether_length +\n@@ -1334,7 +1334,7 @@ nat_ipv6_tcp_udp_checksum_update(uint16_t cksum0,\n }\n \n static __rte_always_inline void\n-pkt_ipv4_work_nat(struct ipv4_hdr *ip,\n+pkt_ipv4_work_nat(struct rte_ipv4_hdr *ip,\n \tstruct nat_ipv4_data *data,\n \tstruct rte_table_action_nat_config *cfg)\n {\n@@ -1420,7 +1420,7 @@ pkt_ipv4_work_nat(struct ipv4_hdr *ip,\n }\n \n static __rte_always_inline void\n-pkt_ipv6_work_nat(struct ipv6_hdr *ip,\n+pkt_ipv6_work_nat(struct rte_ipv6_hdr *ip,\n \tstruct nat_ipv6_data *data,\n \tstruct rte_table_action_nat_config *cfg)\n {\n@@ -1528,7 +1528,7 @@ ttl_apply(void *data,\n }\n \n static __rte_always_inline uint64_t\n-pkt_ipv4_work_ttl(struct ipv4_hdr *ip,\n+pkt_ipv4_work_ttl(struct rte_ipv4_hdr *ip,\n \tstruct ttl_data *data)\n {\n \tuint32_t drop;\n@@ -1549,7 +1549,7 @@ pkt_ipv4_work_ttl(struct ipv4_hdr *ip,\n }\n \n static __rte_always_inline uint64_t\n-pkt_ipv6_work_ttl(struct ipv6_hdr *ip,\n+pkt_ipv6_work_ttl(struct rte_ipv6_hdr *ip,\n \tstruct ttl_data *data)\n {\n \tuint32_t drop;\n@@ -2885,16 +2885,16 @@ pkt_work(struct rte_mbuf *mbuf,\n \tuint16_t total_length;\n \n \tif (cfg->common.ip_version) {\n-\t\tstruct ipv4_hdr *hdr = ip;\n+\t\tstruct rte_ipv4_hdr *hdr = ip;\n \n \t\tdscp = hdr->type_of_service >> 2;\n \t\ttotal_length = rte_ntohs(hdr->total_length);\n \t} else {\n-\t\tstruct ipv6_hdr *hdr = ip;\n+\t\tstruct rte_ipv6_hdr *hdr = ip;\n \n \t\tdscp = (rte_ntohl(hdr->vtc_flow) & 0x0F600000) >> 18;\n \t\ttotal_length =\n-\t\t\trte_ntohs(hdr->payload_len) + sizeof(struct ipv6_hdr);\n+\t\t\trte_ntohs(hdr->payload_len) + sizeof(struct rte_ipv6_hdr);\n \t}\n \n \tif (cfg->action_mask & (1LLU << RTE_TABLE_ACTION_LB)) {\n@@ -3033,10 +3033,10 @@ pkt4_work(struct rte_mbuf **mbufs,\n \tuint16_t total_length0, total_length1, total_length2, total_length3;\n \n \tif (cfg->common.ip_version) {\n-\t\tstruct ipv4_hdr *hdr0 = ip0;\n-\t\tstruct ipv4_hdr *hdr1 = ip1;\n-\t\tstruct ipv4_hdr *hdr2 = ip2;\n-\t\tstruct ipv4_hdr *hdr3 = ip3;\n+\t\tstruct rte_ipv4_hdr *hdr0 = ip0;\n+\t\tstruct rte_ipv4_hdr *hdr1 = ip1;\n+\t\tstruct rte_ipv4_hdr *hdr2 = ip2;\n+\t\tstruct rte_ipv4_hdr *hdr3 = ip3;\n \n \t\tdscp0 = hdr0->type_of_service >> 2;\n \t\tdscp1 = hdr1->type_of_service >> 2;\n@@ -3048,10 +3048,10 @@ pkt4_work(struct rte_mbuf **mbufs,\n \t\ttotal_length2 = rte_ntohs(hdr2->total_length);\n \t\ttotal_length3 = rte_ntohs(hdr3->total_length);\n \t} else {\n-\t\tstruct ipv6_hdr *hdr0 = ip0;\n-\t\tstruct ipv6_hdr *hdr1 = ip1;\n-\t\tstruct ipv6_hdr *hdr2 = ip2;\n-\t\tstruct ipv6_hdr *hdr3 = ip3;\n+\t\tstruct rte_ipv6_hdr *hdr0 = ip0;\n+\t\tstruct rte_ipv6_hdr *hdr1 = ip1;\n+\t\tstruct rte_ipv6_hdr *hdr2 = ip2;\n+\t\tstruct rte_ipv6_hdr *hdr3 = ip3;\n \n \t\tdscp0 = (rte_ntohl(hdr0->vtc_flow) & 0x0F600000) >> 18;\n \t\tdscp1 = (rte_ntohl(hdr1->vtc_flow) & 0x0F600000) >> 18;\n@@ -3059,13 +3059,13 @@ pkt4_work(struct rte_mbuf **mbufs,\n \t\tdscp3 = (rte_ntohl(hdr3->vtc_flow) & 0x0F600000) >> 18;\n \n \t\ttotal_length0 =\n-\t\t\trte_ntohs(hdr0->payload_len) + sizeof(struct ipv6_hdr);\n+\t\t\trte_ntohs(hdr0->payload_len) + sizeof(struct rte_ipv6_hdr);\n \t\ttotal_length1 =\n-\t\t\trte_ntohs(hdr1->payload_len) + sizeof(struct ipv6_hdr);\n+\t\t\trte_ntohs(hdr1->payload_len) + sizeof(struct rte_ipv6_hdr);\n \t\ttotal_length2 =\n-\t\t\trte_ntohs(hdr2->payload_len) + sizeof(struct ipv6_hdr);\n+\t\t\trte_ntohs(hdr2->payload_len) + sizeof(struct rte_ipv6_hdr);\n \t\ttotal_length3 =\n-\t\t\trte_ntohs(hdr3->payload_len) + sizeof(struct ipv6_hdr);\n+\t\t\trte_ntohs(hdr3->payload_len) + sizeof(struct rte_ipv6_hdr);\n \t}\n \n \tif (cfg->action_mask & (1LLU << RTE_TABLE_ACTION_LB)) {\ndiff --git a/lib/librte_port/rte_port_ras.c b/lib/librte_port/rte_port_ras.c\nindex c8b2e19bf..2e807e805 100644\n--- a/lib/librte_port/rte_port_ras.c\n+++ b/lib/librte_port/rte_port_ras.c\n@@ -151,7 +151,7 @@ static void\n process_ipv4(struct rte_port_ring_writer_ras *p, struct rte_mbuf *pkt)\n {\n \t/* Assume there is no ethernet header */\n-\tstruct ipv4_hdr *pkt_hdr = rte_pktmbuf_mtod(pkt, struct ipv4_hdr *);\n+\tstruct rte_ipv4_hdr *pkt_hdr = rte_pktmbuf_mtod(pkt, struct rte_ipv4_hdr *);\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@@ -182,7 +182,7 @@ static void\n process_ipv6(struct rte_port_ring_writer_ras *p, struct rte_mbuf *pkt)\n {\n \t/* Assume there is no ethernet header */\n-\tstruct ipv6_hdr *pkt_hdr = rte_pktmbuf_mtod(pkt, struct ipv6_hdr *);\n+\tstruct rte_ipv6_hdr *pkt_hdr = rte_pktmbuf_mtod(pkt, struct rte_ipv6_hdr *);\n \n \tstruct ipv6_extension_fragment *frag_hdr;\n \tuint16_t frag_data = 0;\ndiff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c\nindex e8f3edc07..2960a5c8a 100644\n--- a/lib/librte_vhost/virtio_net.c\n+++ b/lib/librte_vhost/virtio_net.c\n@@ -238,9 +238,9 @@ virtio_enqueue_offload(struct rte_mbuf *m_buf, struct virtio_net_hdr *net_hdr)\n \n \t/* IP cksum verification cannot be bypassed, then calculate here */\n \tif (m_buf->ol_flags & PKT_TX_IP_CKSUM) {\n-\t\tstruct ipv4_hdr *ipv4_hdr;\n+\t\tstruct rte_ipv4_hdr *ipv4_hdr;\n \n-\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m_buf, struct ipv4_hdr *,\n+\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m_buf, struct rte_ipv4_hdr *,\n \t\t\t\t\t\t   m_buf->l2_len);\n \t\tipv4_hdr->hdr_checksum = rte_ipv4_cksum(ipv4_hdr);\n \t}\n@@ -966,8 +966,8 @@ virtio_net_with_host_offload(struct virtio_net *dev)\n static void\n parse_ethernet(struct rte_mbuf *m, uint16_t *l4_proto, void **l4_hdr)\n {\n-\tstruct ipv4_hdr *ipv4_hdr;\n-\tstruct ipv6_hdr *ipv6_hdr;\n+\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\tstruct rte_ipv6_hdr *ipv6_hdr;\n \tvoid *l3_hdr = NULL;\n \tstruct rte_ether_hdr *eth_hdr;\n \tuint16_t ethertype;\n@@ -997,7 +997,7 @@ parse_ethernet(struct rte_mbuf *m, uint16_t *l4_proto, void **l4_hdr)\n \tcase RTE_ETHER_TYPE_IPv6:\n \t\tipv6_hdr = l3_hdr;\n \t\t*l4_proto = ipv6_hdr->proto;\n-\t\tm->l3_len = sizeof(struct ipv6_hdr);\n+\t\tm->l3_len = sizeof(struct rte_ipv6_hdr);\n \t\t*l4_hdr = (char *)l3_hdr + m->l3_len;\n \t\tm->ol_flags |= PKT_TX_IPV6;\n \t\tbreak;\n",
    "prefixes": [
        "RFC",
        "v2",
        "10/14"
    ]
}