Patch Detail

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

{
    "id": 79559,
    "url": "http://patches.dpdk.org/api/patches/79559/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20201002155855.622456-8-bruce.richardson@intel.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": "<20201002155855.622456-8-bruce.richardson@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20201002155855.622456-8-bruce.richardson@intel.com",
    "date": "2020-10-02T15:58:54",
    "name": "[RFC,v2,7/8] build: replace use of old build macros",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "e6b9fe8086e7a95b3df8dbebcfea3245ccdafbf2",
    "submitter": {
        "id": 20,
        "url": "http://patches.dpdk.org/api/people/20/?format=api",
        "name": "Bruce Richardson",
        "email": "bruce.richardson@intel.com"
    },
    "delegate": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/users/1/?format=api",
        "username": "tmonjalo",
        "first_name": "Thomas",
        "last_name": "Monjalon",
        "email": "thomas@monjalon.net"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20201002155855.622456-8-bruce.richardson@intel.com/mbox/",
    "series": [
        {
            "id": 12672,
            "url": "http://patches.dpdk.org/api/series/12672/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12672",
            "date": "2020-10-02T15:58:47",
            "name": "Rework build macros",
            "version": 2,
            "mbox": "http://patches.dpdk.org/series/12672/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/79559/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/79559/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Received": [
            "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 2F408A04BC;\n\tFri,  2 Oct 2020 18:02:25 +0200 (CEST)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id E03E81DAE5;\n\tFri,  2 Oct 2020 17:59:45 +0200 (CEST)",
            "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n by dpdk.org (Postfix) with ESMTP id 56F4B1DAE5\n for <dev@dpdk.org>; Fri,  2 Oct 2020 17:59:43 +0200 (CEST)",
            "from orsmga003.jf.intel.com ([10.7.209.27])\n by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 02 Oct 2020 08:59:42 -0700",
            "from silpixa00399126.ir.intel.com ([10.237.222.4])\n by orsmga003.jf.intel.com with ESMTP; 02 Oct 2020 08:59:39 -0700"
        ],
        "IronPort-SDR": [
            "\n 8MwZ9kUiOc2OEy+U8F+V092foMe6VZqd2F+6p8iblPefl8mLsgLINJOC+i2kOugp9EcFDE1w6M\n UoKy9mvC/j7w==",
            "\n 6YlM5buUGHxp+85TxTVAAkYnj7Wv5RIqbahTl6tbGFM/nb+crb7h5SuC/0dy4q3eYf4254sNGg\n mVH2UDAKoO4w=="
        ],
        "X-IronPort-AV": [
            "E=McAfee;i=\"6000,8403,9762\"; a=\"163115278\"",
            "E=Sophos;i=\"5.77,328,1596524400\"; d=\"scan'208\";a=\"163115278\"",
            "E=Sophos;i=\"5.77,328,1596524400\"; d=\"scan'208\";a=\"309069050\""
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "From": "Bruce Richardson <bruce.richardson@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "david.marchand@redhat.com, arybchenko@solarflare.com,\n ferruh.yigit@intel.com, thomas@monjalon.net,\n Bruce Richardson <bruce.richardson@intel.com>",
        "Date": "Fri,  2 Oct 2020 16:58:54 +0100",
        "Message-Id": "<20201002155855.622456-8-bruce.richardson@intel.com>",
        "X-Mailer": "git-send-email 2.25.1",
        "In-Reply-To": "<20201002155855.622456-1-bruce.richardson@intel.com>",
        "References": "<20200916164429.244847-1-bruce.richardson@intel.com>\n <20201002155855.622456-1-bruce.richardson@intel.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[dpdk-dev] [RFC PATCH v2 7/8] build: replace use of old build macros",
        "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 <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 <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "Use the newer macros defined by meson in all DPDK source code, to ensure\nthere are no errors when the old non-standard macros are removed.\n\nSigned-off-by: Bruce Richardson <bruce.richardson@intel.com>\n---\n app/proc-info/main.c                          |   4 +-\n app/test-bbdev/meson.build                    |   4 +-\n app/test-bbdev/test_bbdev_perf.c              |   8 +-\n app/test-crypto-perf/cperf_ops.c              |   6 +-\n app/test-crypto-perf/cperf_options.h          |   6 +-\n app/test-crypto-perf/cperf_options_parsing.c  |  16 +-\n .../cperf_test_pmd_cyclecount.c               |   2 +-\n app/test-crypto-perf/cperf_test_throughput.c  |   2 +-\n app/test-crypto-perf/main.c                   |   6 +-\n app/test-crypto-perf/meson.build              |   2 +-\n app/test-pipeline/main.c                      |   2 +-\n app/test-pmd/bpf_cmd.h                        |   4 +-\n app/test-pmd/cmdline.c                        | 190 +++++++++---------\n app/test-pmd/config.c                         |  18 +-\n app/test-pmd/meson.build                      |  22 +-\n app/test-pmd/parameters.c                     |  30 +--\n app/test-pmd/testpmd.c                        |  38 ++--\n app/test-pmd/testpmd.h                        |   4 +-\n app/test/meson.build                          |  26 +--\n app/test/process.h                            |  16 +-\n app/test/test.c                               |  20 +-\n app/test/test_cryptodev.c                     |  26 +--\n app/test/test_cryptodev_hash_test_vectors.h   |   2 +-\n app/test/test_eal_flags.c                     |   4 +-\n app/test/test_func_reentrancy.c               |  24 +--\n app/test/test_kni.c                           |   2 +-\n app/test/test_mp_secondary.c                  |  12 +-\n app/test/test_power.c                         |   2 +-\n app/test/test_power_cpufreq.c                 |   2 +-\n app/test/test_power_kvm_vm.c                  |   2 +-\n app/test/test_table.c                         |   2 +-\n app/test/test_table.h                         |   2 +-\n app/test/test_table_combined.h                |   2 +-\n app/test/test_table_tables.h                  |   2 +-\n config/arm/meson.build                        |   6 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dpio.c      |   6 +-\n drivers/compress/qat/qat_comp.h               |   2 +-\n drivers/compress/qat/qat_comp_pmd.h           |   2 +-\n .../crypto/aesni_mb/aesni_mb_pmd_private.h    |   2 +-\n drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c   |  22 +-\n drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h     |   8 +-\n drivers/crypto/dpaa_sec/dpaa_sec.c            |  24 +--\n drivers/crypto/dpaa_sec/dpaa_sec.h            |   8 +-\n drivers/crypto/qat/qat_sym.c                  |   2 +-\n drivers/crypto/qat/qat_sym.h                  |   8 +-\n drivers/crypto/qat/qat_sym_capabilities.h     |   2 +-\n drivers/crypto/qat/qat_sym_pmd.c              |  12 +-\n drivers/crypto/qat/qat_sym_pmd.h              |   2 +-\n drivers/crypto/qat/qat_sym_session.c          |   4 +-\n drivers/crypto/qat/qat_sym_session.h          |   4 +-\n drivers/net/ixgbe/ixgbe_ethdev.c              |   6 +-\n drivers/net/ixgbe/ixgbe_ethdev.h              |   4 +-\n drivers/net/ixgbe/ixgbe_flow.c                |   6 +-\n drivers/net/ixgbe/ixgbe_rxtx.c                |  26 +--\n drivers/net/ixgbe/ixgbe_rxtx.h                |   6 +-\n drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c        |   6 +-\n drivers/net/kni/meson.build                   |   2 +-\n drivers/net/netvsc/meson.build                |   2 +-\n drivers/net/vhost/meson.build                 |   2 +-\n drivers/raw/dpaa2_cmdif/meson.build           |   2 +-\n drivers/raw/dpaa2_qdma/meson.build            |   2 +-\n drivers/raw/ifpga/base/opae_osdep.h           |   2 +-\n drivers/vdpa/ifc/meson.build                  |   2 +-\n examples/distributor/meson.build              |   2 +-\n examples/ethtool/lib/rte_ethtool.c            |   4 +-\n examples/ethtool/meson.build                  |   2 +-\n examples/ioat/meson.build                     |   2 +-\n examples/ip_pipeline/kni.c                    |   4 +-\n examples/ip_pipeline/kni.h                    |   4 +-\n examples/ip_pipeline/pipeline.c               |  14 +-\n examples/kni/meson.build                      |   2 +-\n examples/l2fwd-crypto/main.c                  |   4 +-\n examples/l2fwd-crypto/meson.build             |   2 +-\n examples/l3fwd-power/meson.build              |   2 +-\n examples/ntb/meson.build                      |   2 +-\n examples/vhost_crypto/meson.build             |   2 +-\n examples/vm_power_manager/channel_monitor.c   |   8 +-\n .../vm_power_manager/guest_cli/meson.build    |   2 +-\n examples/vm_power_manager/main.c              |  12 +-\n examples/vm_power_manager/meson.build         |   8 +-\n lib/librte_eal/linux/eal.c                    |   4 +-\n lib/librte_metrics/rte_metrics_telemetry.c    |   4 +-\n lib/librte_metrics/rte_metrics_telemetry.h    |   2 +-\n lib/librte_port/meson.build                   |   2 +-\n lib/meson.build                               |   2 +-\n 85 files changed, 391 insertions(+), 391 deletions(-)",
    "diff": "diff --git a/app/proc-info/main.c b/app/proc-info/main.c\nindex 64fb83b38d..0fea033bb5 100644\n--- a/app/proc-info/main.c\n+++ b/app/proc-info/main.c\n@@ -30,7 +30,7 @@\n #include <rte_string_fns.h>\n #include <rte_metrics.h>\n #include <rte_cycles.h>\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #include <rte_security.h>\n #endif\n #include <rte_cryptodev.h>\n@@ -739,7 +739,7 @@ show_port(void)\n \t\t}\n \n \t\tprintf(\"  - cyrpto context\\n\");\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\tvoid *p_ctx = rte_eth_dev_get_sec_ctx(i);\n \t\tprintf(\"\\t  -- security context - %p\\n\", p_ctx);\n \ndiff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build\nindex 178306b08c..a2bd7dca6b 100644\n--- a/app/test-bbdev/meson.build\n+++ b/app/test-bbdev/meson.build\n@@ -6,9 +6,9 @@ sources = files('main.c',\n \t\t'test_bbdev_perf.c',\n \t\t'test_bbdev_vector.c')\n deps += ['bbdev', 'bus_vdev']\n-if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC')\n+if dpdk_conf.has('RTE_BASEBAND_FPGA_LTE_FEC')\n \tdeps += ['baseband_fpga_lte_fec']\n endif\n-if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC')\n+if dpdk_conf.has('RTE_BASEBAND_FPGA_5GNR_FEC')\n \tdeps += ['baseband_fpga_5gnr_fec']\n endif\ndiff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c\nindex 45c0d62aca..2e85eccf94 100644\n--- a/app/test-bbdev/test_bbdev_perf.c\n+++ b/app/test-bbdev/test_bbdev_perf.c\n@@ -26,7 +26,7 @@\n #define MAX_QUEUES RTE_MAX_LCORE\n #define TEST_REPETITIONS 1000\n \n-#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC\n+#ifdef RTE_BASEBAND_FPGA_LTE_FEC\n #include <fpga_lte_fec.h>\n #define FPGA_LTE_PF_DRIVER_NAME (\"intel_fpga_lte_fec_pf\")\n #define FPGA_LTE_VF_DRIVER_NAME (\"intel_fpga_lte_fec_vf\")\n@@ -39,7 +39,7 @@\n #define FLR_4G_TIMEOUT 610\n #endif\n \n-#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC\n+#ifdef RTE_BASEBAND_FPGA_5GNR_FEC\n #include <rte_pmd_fpga_5gnr_fec.h>\n #define FPGA_5GNR_PF_DRIVER_NAME (\"intel_fpga_5gnr_fec_pf\")\n #define FPGA_5GNR_VF_DRIVER_NAME (\"intel_fpga_5gnr_fec_vf\")\n@@ -565,7 +565,7 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,\n /* Configure fpga lte fec with PF & VF values\n  * if '-i' flag is set and using fpga device\n  */\n-#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC\n+#ifdef RTE_BASEBAND_FPGA_LTE_FEC\n \tif ((get_init_device() == true) &&\n \t\t(!strcmp(info->drv.driver_name, FPGA_LTE_PF_DRIVER_NAME))) {\n \t\tstruct fpga_lte_fec_conf conf;\n@@ -609,7 +609,7 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,\n \t\t\t\tinfo->dev_name);\n \t}\n #endif\n-#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC\n+#ifdef RTE_BASEBAND_FPGA_5GNR_FEC\n \tif ((get_init_device() == true) &&\n \t\t(!strcmp(info->drv.driver_name, FPGA_5GNR_PF_DRIVER_NAME))) {\n \t\tstruct fpga_5gnr_fec_conf conf;\ndiff --git a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c\nindex 3da835a9c5..cc45af7f22 100644\n--- a/app/test-crypto-perf/cperf_ops.c\n+++ b/app/test-crypto-perf/cperf_ops.c\n@@ -8,7 +8,7 @@\n #include \"cperf_ops.h\"\n #include \"cperf_test_vectors.h\"\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static int\n cperf_set_ops_security(struct rte_crypto_op **ops,\n \t\tuint32_t src_buf_offset __rte_unused,\n@@ -551,7 +551,7 @@ cperf_create_session(struct rte_mempool *sess_mp,\n \tstruct rte_crypto_sym_xform aead_xform;\n \tstruct rte_cryptodev_sym_session *sess = NULL;\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t/*\n \t * security only\n \t */\n@@ -844,7 +844,7 @@ cperf_get_op_functions(const struct cperf_options *options,\n \t\t\top_fns->populate_ops = cperf_set_ops_cipher;\n \t\treturn 0;\n \t}\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tif (options->op_type == CPERF_PDCP) {\n \t\top_fns->populate_ops = cperf_set_ops_security;\n \t\treturn 0;\ndiff --git a/app/test-crypto-perf/cperf_options.h b/app/test-crypto-perf/cperf_options.h\nindex 256fabb072..9664a4b343 100644\n--- a/app/test-crypto-perf/cperf_options.h\n+++ b/app/test-crypto-perf/cperf_options.h\n@@ -7,7 +7,7 @@\n \n #include <rte_crypto.h>\n #include <rte_cryptodev.h>\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #include <rte_security.h>\n #endif\n \n@@ -47,7 +47,7 @@\n \n #define CPERF_DIGEST_SZ\t\t(\"digest-sz\")\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #define CPERF_PDCP_SN_SZ\t(\"pdcp-sn-sz\")\n #define CPERF_PDCP_DOMAIN\t(\"pdcp-domain\")\n #define CPERF_PDCP_SES_HFN_EN\t(\"pdcp-ses-hfn-en\")\n@@ -123,7 +123,7 @@ struct cperf_options {\n \n \tuint16_t digest_sz;\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tuint16_t pdcp_sn_sz;\n \tuint16_t pdcp_ses_hfn_en;\n \tenum rte_security_pdcp_domain pdcp_domain;\ndiff --git a/app/test-crypto-perf/cperf_options_parsing.c b/app/test-crypto-perf/cperf_options_parsing.c\nindex 8e086f88ec..03ed6f5942 100644\n--- a/app/test-crypto-perf/cperf_options_parsing.c\n+++ b/app/test-crypto-perf/cperf_options_parsing.c\n@@ -57,7 +57,7 @@ usage(char *progname)\n \t\t\" --pmd-cyclecount-delay-ms N: set delay between enqueue\\n\"\n \t\t\"           and dequeue in pmd-cyclecount benchmarking mode\\n\"\n \t\t\" --csv-friendly: enable test result output CSV friendly\\n\"\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\t\" --pdcp-sn-sz N: set PDCP SN size N <5/7/12/15/18>\\n\"\n \t\t\" --pdcp-domain DOMAIN: set PDCP domain <control/user>\\n\"\n \t\t\" --pdcp-ses-hfn-en: enable session based fixed HFN\\n\"\n@@ -631,7 +631,7 @@ parse_digest_sz(struct cperf_options *opts, const char *arg)\n \treturn parse_uint16_t(&opts->digest_sz, arg);\n }\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static int\n parse_pdcp_sn_sz(struct cperf_options *opts, const char *arg)\n {\n@@ -841,7 +841,7 @@ static struct option lgopts[] = {\n \n \t{ CPERF_DIGEST_SZ, required_argument, 0, 0 },\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t{ CPERF_PDCP_SN_SZ, required_argument, 0, 0 },\n \t{ CPERF_PDCP_DOMAIN, required_argument, 0, 0 },\n \t{ CPERF_PDCP_SES_HFN_EN, no_argument, 0, 0 },\n@@ -913,7 +913,7 @@ cperf_options_default(struct cperf_options *opts)\n \topts->digest_sz = 12;\n \n \topts->pmdcc_delay = 0;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \topts->pdcp_sn_sz = 12;\n \topts->pdcp_domain = RTE_SECURITY_PDCP_MODE_CONTROL;\n \topts->pdcp_ses_hfn_en = 0;\n@@ -954,7 +954,7 @@ cperf_opts_parse_long(int opt_idx, struct cperf_options *opts)\n \t\t{ CPERF_AEAD_IV_SZ,\tparse_aead_iv_sz },\n \t\t{ CPERF_AEAD_AAD_SZ,\tparse_aead_aad_sz },\n \t\t{ CPERF_DIGEST_SZ,\tparse_digest_sz },\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\t{ CPERF_PDCP_SN_SZ,\tparse_pdcp_sn_sz },\n \t\t{ CPERF_PDCP_DOMAIN,\tparse_pdcp_domain },\n \t\t{ CPERF_PDCP_SES_HFN_EN,\tparse_pdcp_ses_hfn_en },\n@@ -1061,7 +1061,7 @@ check_cipher_buffer_length(struct cperf_options *options)\n \treturn 0;\n }\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static int\n check_docsis_buffer_length(struct cperf_options *options)\n {\n@@ -1215,7 +1215,7 @@ cperf_options_check(struct cperf_options *options)\n \t\t\treturn -EINVAL;\n \t}\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tif (options->op_type == CPERF_DOCSIS) {\n \t\tif (check_docsis_buffer_length(options) < 0)\n \t\t\treturn -EINVAL;\n@@ -1308,7 +1308,7 @@ cperf_options_dump(struct cperf_options *opts)\n \t\tprintf(\"#\\n\");\n \t}\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tif (opts->op_type == CPERF_DOCSIS) {\n \t\tprintf(\"# docsis header size: %u\\n\", opts->docsis_hdr_sz);\n \t\tprintf(\"#\\n\");\ndiff --git a/app/test-crypto-perf/cperf_test_pmd_cyclecount.c b/app/test-crypto-perf/cperf_test_pmd_cyclecount.c\nindex 69f0943d14..4e67d3aebd 100644\n--- a/app/test-crypto-perf/cperf_test_pmd_cyclecount.c\n+++ b/app/test-crypto-perf/cperf_test_pmd_cyclecount.c\n@@ -63,7 +63,7 @@ cperf_pmd_cyclecount_test_free(struct cperf_pmd_cyclecount_ctx *ctx)\n \t\treturn;\n \n \tif (ctx->sess) {\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\tif (ctx->options->op_type == CPERF_PDCP ||\n \t\t\t\tctx->options->op_type == CPERF_DOCSIS) {\n \t\t\tstruct rte_security_ctx *sec_ctx =\ndiff --git a/app/test-crypto-perf/cperf_test_throughput.c b/app/test-crypto-perf/cperf_test_throughput.c\nindex 12d9ea4f9f..f30f7d5c2c 100644\n--- a/app/test-crypto-perf/cperf_test_throughput.c\n+++ b/app/test-crypto-perf/cperf_test_throughput.c\n@@ -35,7 +35,7 @@ cperf_throughput_test_free(struct cperf_throughput_ctx *ctx)\n \tif (!ctx)\n \t\treturn;\n \tif (ctx->sess) {\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\tif (ctx->options->op_type == CPERF_PDCP ||\n \t\t\t\tctx->options->op_type == CPERF_DOCSIS) {\n \t\t\tstruct rte_security_ctx *sec_ctx =\ndiff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c\nindex 8f8e580e4d..f4f7e31c92 100644\n--- a/app/test-crypto-perf/main.c\n+++ b/app/test-crypto-perf/main.c\n@@ -9,7 +9,7 @@\n #include <rte_random.h>\n #include <rte_eal.h>\n #include <rte_cryptodev.h>\n-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER\n+#ifdef RTE_CRYPTO_SCHEDULER\n #include <rte_cryptodev_scheduler.h>\n #endif\n \n@@ -170,7 +170,7 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs)\n \tfor (i = 0; i < enabled_cdev_count &&\n \t\t\ti < RTE_CRYPTO_MAX_DEVS; i++) {\n \t\tcdev_id = enabled_cdevs[i];\n-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER\n+#ifdef RTE_CRYPTO_SCHEDULER\n \t\t/*\n \t\t * If multi-core scheduler is used, limit the number\n \t\t * of queue pairs to 1, as there is no way to know\n@@ -238,7 +238,7 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs)\n \t\t */\n \t\tif (!strcmp((const char *)opts->device_type,\n \t\t\t\t\t\"crypto_scheduler\")) {\n-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER\n+#ifdef RTE_CRYPTO_SCHEDULER\n \t\t\tuint32_t nb_slaves =\n \t\t\t\trte_cryptodev_scheduler_slaves_get(cdev_id,\n \t\t\t\t\t\t\t\tNULL);\ndiff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build\nindex e6ddda6f0c..558c648788 100644\n--- a/app/test-crypto-perf/meson.build\n+++ b/app/test-crypto-perf/meson.build\n@@ -12,6 +12,6 @@ sources = files('cperf_ops.c',\n \t\t'cperf_test_verify.c',\n \t\t'main.c')\n deps += ['cryptodev', 'net', 'security']\n-if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')\n+if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')\n \tdeps += 'crypto_scheduler'\n endif\ndiff --git a/app/test-pipeline/main.c b/app/test-pipeline/main.c\nindex 7f0d6d3f18..c7be5942fa 100644\n--- a/app/test-pipeline/main.c\n+++ b/app/test-pipeline/main.c\n@@ -126,7 +126,7 @@ app_lcore_main_loop(__rte_unused void *arg)\n \t\t\treturn 0;\n \n \t\tcase e_APP_PIPELINE_ACL:\n-#ifndef RTE_LIBRTE_ACL\n+#ifndef RTE_LIB_ACL\n \t\t\trte_exit(EXIT_FAILURE, \"ACL not present in build\\n\");\n #else\n \t\t\tapp_main_loop_worker_pipeline_acl();\ndiff --git a/app/test-pmd/bpf_cmd.h b/app/test-pmd/bpf_cmd.h\nindex 5ee4c9f796..66bc706358 100644\n--- a/app/test-pmd/bpf_cmd.h\n+++ b/app/test-pmd/bpf_cmd.h\n@@ -5,12 +5,12 @@\n #ifndef _BPF_CMD_H_\n #define _BPF_CMD_H_\n \n-#ifdef RTE_LIBRTE_BPF\n+#ifdef RTE_LIB_BPF\n \n  /* BPF CLI */\n extern cmdline_parse_inst_t cmd_operate_bpf_ld_parse;\n extern cmdline_parse_inst_t cmd_operate_bpf_unld_parse;\n \n-#endif /* RTE_LIBRTE_BPF */\n+#endif /* RTE_LIB_BPF */\n \n #endif /* _BPF_CMD_H_ */\ndiff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex 524c75b267..3d09083498 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -50,20 +50,20 @@\n #include <cmdline_parse_etheraddr.h>\n #include <cmdline_socket.h>\n #include <cmdline.h>\n-#ifdef RTE_LIBRTE_PMD_BOND\n+#ifdef RTE_NET_BOND\n #include <rte_eth_bond.h>\n #include <rte_eth_bond_8023ad.h>\n #endif\n-#if defined RTE_LIBRTE_DPAA_BUS && defined RTE_LIBRTE_DPAA_PMD\n+#if defined RTE_BUS_DPAA && defined RTE_NET_DPAA\n #include <rte_pmd_dpaa.h>\n #endif\n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n #include <rte_pmd_ixgbe.h>\n #endif\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n #include <rte_pmd_i40e.h>\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n #include <rte_pmd_bnxt.h>\n #endif\n #include \"testpmd.h\"\n@@ -606,7 +606,7 @@ static void cmd_help_long_parsed(void *parsed_result,\n \t\t\t\"   Show the bypass configuration for a bypass enabled NIC\"\n \t\t\t\" using the lowest port on the NIC.\\n\\n\"\n \n-#ifdef RTE_LIBRTE_PMD_BOND\n+#ifdef RTE_NET_BOND\n \t\t\t\"create bonded device (mode) (socket)\\n\"\n \t\t\t\"\tCreate a new bonded device with specific bonding mode and socket.\\n\\n\"\n \n@@ -5448,7 +5448,7 @@ cmd_set_bypass_mode_parsed(void *parsed_result,\n \tportid_t port_id = res->port_id;\n \tint32_t rc = -EINVAL;\n \n-#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS\n+#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS\n \tuint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;\n \n \tif (!strcmp(res->value, \"bypass\"))\n@@ -5516,7 +5516,7 @@ cmd_set_bypass_event_parsed(void *parsed_result,\n \tstruct cmd_set_bypass_event_result *res = parsed_result;\n \tportid_t port_id = res->port_id;\n \n-#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS\n+#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS\n \tuint32_t bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_NONE;\n \tuint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;\n \n@@ -5621,7 +5621,7 @@ cmd_set_bypass_timeout_parsed(void *parsed_result,\n {\n \t__rte_unused struct cmd_set_bypass_timeout_result *res = parsed_result;\n \n-#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS\n+#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS\n \tif (!strcmp(res->value, \"1.5\"))\n \t\tbypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_1_5_SEC;\n \telse if (!strcmp(res->value, \"2\"))\n@@ -5684,7 +5684,7 @@ cmd_show_bypass_config_parsed(void *parsed_result,\n \tstruct cmd_show_bypass_config_result *res = parsed_result;\n \tportid_t port_id = res->port_id;\n \tint rc = -EINVAL;\n-#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS\n+#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS\n \tuint32_t event_mode;\n \tuint32_t bypass_mode;\n \tuint32_t timeout = bypass_timeout;\n@@ -5767,7 +5767,7 @@ cmdline_parse_inst_t cmd_show_bypass_config = {\n \t},\n };\n \n-#ifdef RTE_LIBRTE_PMD_BOND\n+#ifdef RTE_NET_BOND\n /* *** SET BONDING MODE *** */\n struct cmd_set_bonding_mode_result {\n \tcmdline_fixed_string_t set;\n@@ -6537,7 +6537,7 @@ cmdline_parse_inst_t cmd_set_bonding_agg_mode_policy = {\n };\n \n \n-#endif /* RTE_LIBRTE_PMD_BOND */\n+#endif /* RTE_NET_BOND */\n \n /* *** SET FORWARDING MODE *** */\n struct cmd_set_fwd_mode_result {\n@@ -8822,12 +8822,12 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,\n \n \tRTE_SET_USED(is_on);\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_ixgbe_set_vf_rxmode(res->port_id, res->vf_id,\n \t\t\t\t\t\t  vf_rxmode, (uint8_t)is_on);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_bnxt_set_vf_rxmode(res->port_id, res->vf_id,\n \t\t\t\t\t\t vf_rxmode, (uint8_t)is_on);\n@@ -8901,12 +8901,12 @@ static void cmd_vf_mac_addr_parsed(void *parsed_result,\n \tif (strcmp(res->what, \"add\") != 0)\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_i40e_add_vf_mac_addr(res->port_num, res->vf_num,\n \t\t\t\t\t\t   &res->address);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_bnxt_mac_addr_add(res->port_num, &res->address,\n \t\t\t\t\t\tres->vf_num);\n@@ -8977,17 +8977,17 @@ cmd_vf_rx_vlan_filter_parsed(void *parsed_result,\n \n \t__rte_unused int is_add = (strcmp(res->what, \"add\") == 0) ? 1 : 0;\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_ixgbe_set_vf_vlan_filter(res->port_id,\n \t\t\t\tres->vlan_id, res->vf_mask, is_add);\n #endif\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_i40e_set_vf_vlan_filter(res->port_id,\n \t\t\t\tres->vlan_id, res->vf_mask, is_add);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_bnxt_set_vf_vlan_filter(res->port_id,\n \t\t\t\tres->vlan_id, res->vf_mask, is_add);\n@@ -9514,7 +9514,7 @@ cmd_global_config_parsed(void *parsed_result,\n \tconf.cfg.gre_key_len = res->len;\n \tret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_NONE,\n \t\t\t\t      RTE_ETH_FILTER_SET, &conf);\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_i40e_set_gre_key_len(res->port_id, res->len);\n #endif\n@@ -10078,7 +10078,7 @@ cmd_queue_region_parsed(void *parsed_result,\n {\n \tstruct cmd_queue_region_result *res = parsed_result;\n \tint ret = -ENOTSUP;\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tstruct rte_pmd_i40e_queue_region_conf region_conf;\n \tenum rte_pmd_i40e_queue_region_op op_type;\n #endif\n@@ -10086,7 +10086,7 @@ cmd_queue_region_parsed(void *parsed_result,\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tmemset(&region_conf, 0, sizeof(region_conf));\n \top_type = RTE_PMD_I40E_RSS_QUEUE_REGION_SET;\n \tregion_conf.region_id = res->region_id;\n@@ -10177,7 +10177,7 @@ cmd_region_flowtype_parsed(void *parsed_result,\n {\n \tstruct cmd_region_flowtype_result *res = parsed_result;\n \tint ret = -ENOTSUP;\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tstruct rte_pmd_i40e_queue_region_conf region_conf;\n \tenum rte_pmd_i40e_queue_region_op op_type;\n #endif\n@@ -10185,7 +10185,7 @@ cmd_region_flowtype_parsed(void *parsed_result,\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tmemset(&region_conf, 0, sizeof(region_conf));\n \n \top_type = RTE_PMD_I40E_RSS_QUEUE_REGION_FLOWTYPE_SET;\n@@ -10268,7 +10268,7 @@ cmd_user_priority_region_parsed(void *parsed_result,\n {\n \tstruct cmd_user_priority_region_result *res = parsed_result;\n \tint ret = -ENOTSUP;\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tstruct rte_pmd_i40e_queue_region_conf region_conf;\n \tenum rte_pmd_i40e_queue_region_op op_type;\n #endif\n@@ -10276,7 +10276,7 @@ cmd_user_priority_region_parsed(void *parsed_result,\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tmemset(&region_conf, 0, sizeof(region_conf));\n \top_type = RTE_PMD_I40E_RSS_QUEUE_REGION_USER_PRIORITY_SET;\n \tregion_conf.user_priority = res->user_priority_id;\n@@ -10359,7 +10359,7 @@ cmd_flush_queue_region_parsed(void *parsed_result,\n {\n \tstruct cmd_flush_queue_region_result *res = parsed_result;\n \tint ret = -ENOTSUP;\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tstruct rte_pmd_i40e_queue_region_conf region_conf;\n \tenum rte_pmd_i40e_queue_region_op op_type;\n #endif\n@@ -10367,7 +10367,7 @@ cmd_flush_queue_region_parsed(void *parsed_result,\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tmemset(&region_conf, 0, sizeof(region_conf));\n \n \tif (strcmp(res->what, \"on\") == 0)\n@@ -10441,7 +10441,7 @@ cmd_show_queue_region_info_parsed(void *parsed_result,\n {\n \tstruct cmd_show_queue_region_info *res = parsed_result;\n \tint ret = -ENOTSUP;\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tstruct rte_pmd_i40e_queue_regions rte_pmd_regions;\n \tenum rte_pmd_i40e_queue_region_op op_type;\n #endif\n@@ -10449,7 +10449,7 @@ cmd_show_queue_region_info_parsed(void *parsed_result,\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tmemset(&rte_pmd_regions, 0, sizeof(rte_pmd_regions));\n \n \top_type = RTE_PMD_I40E_RSS_QUEUE_REGION_INFO_GET;\n@@ -11345,7 +11345,7 @@ cmd_flow_director_filter_parsed(void *parsed_result,\n \t\t}\n \t} else {\n \t\tif (!strcmp(res->mode_value, \"raw\")) {\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \t\t\tstruct rte_pmd_i40e_flow_type_mapping\n \t\t\t\t\tmapping[RTE_PMD_I40E_FLOW_TYPE_MAX];\n \t\t\tstruct rte_pmd_i40e_pkt_template_conf conf;\n@@ -13703,17 +13703,17 @@ cmd_set_vf_vlan_anti_spoof_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_ixgbe_set_vf_vlan_anti_spoof(res->port_id,\n \t\t\t\tres->vf_id, is_on);\n #endif\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_i40e_set_vf_vlan_anti_spoof(res->port_id,\n \t\t\t\tres->vf_id, is_on);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_bnxt_set_vf_vlan_anti_spoof(res->port_id,\n \t\t\t\tres->vf_id, is_on);\n@@ -13809,17 +13809,17 @@ cmd_set_vf_mac_anti_spoof_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_ixgbe_set_vf_mac_anti_spoof(res->port_id,\n \t\t\tres->vf_id, is_on);\n #endif\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_i40e_set_vf_mac_anti_spoof(res->port_id,\n \t\t\tres->vf_id, is_on);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_bnxt_set_vf_mac_anti_spoof(res->port_id,\n \t\t\tres->vf_id, is_on);\n@@ -13915,17 +13915,17 @@ cmd_set_vf_vlan_stripq_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_ixgbe_set_vf_vlan_stripq(res->port_id,\n \t\t\tres->vf_id, is_on);\n #endif\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_i40e_set_vf_vlan_stripq(res->port_id,\n \t\t\tres->vf_id, is_on);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_bnxt_set_vf_vlan_stripq(res->port_id,\n \t\t\tres->vf_id, is_on);\n@@ -14019,17 +14019,17 @@ cmd_set_vf_vlan_insert_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_ixgbe_set_vf_vlan_insert(res->port_id, res->vf_id,\n \t\t\tres->vlan_id);\n #endif\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_i40e_set_vf_vlan_insert(res->port_id, res->vf_id,\n \t\t\tres->vlan_id);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_bnxt_set_vf_vlan_insert(res->port_id, res->vf_id,\n \t\t\tres->vlan_id);\n@@ -14115,19 +14115,19 @@ cmd_set_tx_loopback_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_ixgbe_set_tx_loopback(res->port_id, is_on);\n #endif\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_i40e_set_tx_loopback(res->port_id, is_on);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_bnxt_set_tx_loopback(res->port_id, is_on);\n #endif\n-#if defined RTE_LIBRTE_DPAA_BUS && defined RTE_LIBRTE_DPAA_PMD\n+#if defined RTE_BUS_DPAA && defined RTE_NET_DPAA\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_dpaa_set_tx_loopback(res->port_id, is_on);\n #endif\n@@ -14214,11 +14214,11 @@ cmd_set_all_queues_drop_en_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_ixgbe_set_all_queues_drop_en(res->port_id, is_on);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_bnxt_set_all_queues_drop_en(res->port_id, is_on);\n #endif\n@@ -14310,7 +14310,7 @@ cmd_set_vf_split_drop_en_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tret = rte_pmd_ixgbe_set_vf_split_drop_en(res->port_id, res->vf_id,\n \t\t\tis_on);\n #endif\n@@ -14402,17 +14402,17 @@ cmd_set_vf_mac_addr_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_ixgbe_set_vf_mac_addr(res->port_id, res->vf_id,\n \t\t\t\t&res->mac_addr);\n #endif\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_i40e_set_vf_mac_addr(res->port_id, res->vf_id,\n \t\t\t\t&res->mac_addr);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_bnxt_set_vf_mac_addr(res->port_id, res->vf_id,\n \t\t\t\t&res->mac_addr);\n@@ -14529,7 +14529,7 @@ cmd_set_macsec_offload_on_parsed(\n \t\treturn;\n \n \tif (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MACSEC_INSERT) {\n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \t\tret = rte_pmd_ixgbe_macsec_enable(port_id, en, rp);\n #endif\n \t}\n@@ -14626,7 +14626,7 @@ cmd_set_macsec_offload_off_parsed(\n \t\treturn;\n \n \tif (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MACSEC_INSERT) {\n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \t\tret = rte_pmd_ixgbe_macsec_disable(port_id);\n #endif\n \t}\n@@ -14712,7 +14712,7 @@ cmd_set_macsec_sc_parsed(\n \tint ret = -ENOTSUP;\n \tint is_tx = (strcmp(res->tx_rx, \"tx\") == 0) ? 1 : 0;\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tret = is_tx ?\n \t\trte_pmd_ixgbe_macsec_config_txsc(res->port_id,\n \t\t\t\tres->mac.addr_bytes) :\n@@ -14831,7 +14831,7 @@ cmd_set_macsec_sa_parsed(\n \t\tkey[i] = (uint8_t) ((xdgt0 * 16) + xdgt1);\n \t}\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tret = is_tx ?\n \t\trte_pmd_ixgbe_macsec_select_txsa(res->port_id,\n \t\t\tres->idx, res->an, res->pn, key) :\n@@ -14928,7 +14928,7 @@ cmd_set_vf_promisc_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_set_vf_unicast_promisc(res->port_id,\n \t\t\t\t\t\t  res->vf_id, is_on);\n #endif\n@@ -15018,7 +15018,7 @@ cmd_set_vf_allmulti_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_set_vf_multicast_promisc(res->port_id,\n \t\t\t\t\t\t    res->vf_id, is_on);\n #endif\n@@ -15108,7 +15108,7 @@ cmd_set_vf_broadcast_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_set_vf_broadcast(res->port_id,\n \t\t\t\t\t    res->vf_id, is_on);\n #endif\n@@ -15202,7 +15202,7 @@ cmd_set_vf_vlan_tag_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_set_vf_vlan_tag(res->port_id,\n \t\t\t\t\t   res->vf_id, is_on);\n #endif\n@@ -15323,7 +15323,7 @@ cmd_vf_max_bw_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_set_vf_max_bw(res->port_id,\n \t\t\t\t\t res->vf_id, res->bw);\n #endif\n@@ -15423,7 +15423,7 @@ cmd_vf_tc_min_bw_parsed(\n \tif (ret)\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_set_vf_tc_bw_alloc(res->port_id, res->vf_id,\n \t\t\t\t\t      tc_num, bw);\n #endif\n@@ -15489,7 +15489,7 @@ cmd_tc_min_bw_parsed(\n \tif (ret)\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tret = rte_pmd_ixgbe_set_tc_bw_alloc(res->port_id, tc_num, bw);\n #endif\n \n@@ -15538,7 +15538,7 @@ cmd_vf_tc_max_bw_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_set_vf_tc_max_bw(res->port_id, res->vf_id,\n \t\t\t\t\t    res->tc_no, res->bw);\n #endif\n@@ -16592,7 +16592,7 @@ cmd_strict_link_prio_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_set_tc_strict_prio(res->port_id, res->tc_map);\n #endif\n \n@@ -16676,7 +16676,7 @@ cmd_ddp_add_parsed(\n \t\treturn;\n \t}\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_i40e_process_ddp_package(res->port_id,\n \t\t\t\t\t       buff, size,\n@@ -16744,7 +16744,7 @@ cmd_ddp_del_parsed(\n \tif (!buff)\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_i40e_process_ddp_package(res->port_id,\n \t\t\t\t\t       buff, size,\n@@ -16799,7 +16799,7 @@ cmd_ddp_info_parsed(\n \tuint8_t *pkg;\n \tuint32_t pkg_size;\n \tint ret = -ENOTSUP;\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tuint32_t i, j, n;\n \tuint8_t *buff;\n \tuint32_t buff_size = 0;\n@@ -16820,7 +16820,7 @@ cmd_ddp_info_parsed(\n \tif (!pkg)\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,\n \t\t\t\t(uint8_t *)&info, sizeof(info),\n \t\t\t\tRTE_PMD_I40E_PKG_INFO_GLOBAL_HEADER);\n@@ -17035,7 +17035,7 @@ cmd_ddp_get_list_parsed(\n \t__rte_unused struct cmdline *cl,\n \t__rte_unused void *data)\n {\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tstruct cmd_ddp_get_list_result *res = parsed_result;\n \tstruct rte_pmd_i40e_profile_list *p_list;\n \tstruct rte_pmd_i40e_profile_info *p_info;\n@@ -17045,7 +17045,7 @@ cmd_ddp_get_list_parsed(\n #endif\n \tint ret = -ENOTSUP;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tsize = PROFILE_INFO_SIZE * MAX_PROFILE_NUM + 4;\n \tp_list = (struct rte_pmd_i40e_profile_list *)malloc(size);\n \tif (!p_list) {\n@@ -17113,7 +17113,7 @@ cmd_cfg_input_set_parsed(\n \t__rte_unused struct cmdline *cl,\n \t__rte_unused void *data)\n {\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tstruct cmd_cfg_input_set_result *res = parsed_result;\n \tenum rte_pmd_i40e_inset_type inset_type = INSET_NONE;\n \tstruct rte_pmd_i40e_inset inset;\n@@ -17125,7 +17125,7 @@ cmd_cfg_input_set_parsed(\n \t\treturn;\n \t}\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (!strcmp(res->inset_type, \"hash_inset\"))\n \t\tinset_type = INSET_HASH;\n \telse if (!strcmp(res->inset_type, \"fdir_inset\"))\n@@ -17236,7 +17236,7 @@ cmd_clear_input_set_parsed(\n \t__rte_unused struct cmdline *cl,\n \t__rte_unused void *data)\n {\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tstruct cmd_clear_input_set_result *res = parsed_result;\n \tenum rte_pmd_i40e_inset_type inset_type = INSET_NONE;\n \tstruct rte_pmd_i40e_inset inset;\n@@ -17248,7 +17248,7 @@ cmd_clear_input_set_parsed(\n \t\treturn;\n \t}\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (!strcmp(res->inset_type, \"hash_inset\"))\n \t\tinset_type = INSET_HASH;\n \telse if (!strcmp(res->inset_type, \"fdir_inset\"))\n@@ -17364,13 +17364,13 @@ cmd_show_vf_stats_parsed(\n \n \tmemset(&stats, 0, sizeof(stats));\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_i40e_get_vf_stats(res->port_id,\n \t\t\t\t\t\tres->vf_id,\n \t\t\t\t\t\t&stats);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_bnxt_get_vf_stats(res->port_id,\n \t\t\t\t\t\tres->vf_id,\n@@ -17469,12 +17469,12 @@ cmd_clear_vf_stats_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_i40e_reset_vf_stats(res->port_id,\n \t\t\t\t\t\t  res->vf_id);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \tif (ret == -ENOTSUP)\n \t\tret = rte_pmd_bnxt_reset_vf_stats(res->port_id,\n \t\t\t\t\t\t  res->vf_id);\n@@ -17561,7 +17561,7 @@ cmd_pctype_mapping_reset_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_flow_type_mapping_reset(res->port_id);\n #endif\n \n@@ -17635,7 +17635,7 @@ cmd_pctype_mapping_get_parsed(\n {\n \tstruct cmd_pctype_mapping_get_result *res = parsed_result;\n \tint ret = -ENOTSUP;\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tstruct rte_pmd_i40e_flow_type_mapping\n \t\t\t\tmapping[RTE_PMD_I40E_FLOW_TYPE_MAX];\n \tint i, j, first_pctype;\n@@ -17644,7 +17644,7 @@ cmd_pctype_mapping_get_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_flow_type_mapping_get(res->port_id, mapping);\n #endif\n \n@@ -17662,7 +17662,7 @@ cmd_pctype_mapping_get_parsed(\n \t\treturn;\n \t}\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tfor (i = 0; i < RTE_PMD_I40E_FLOW_TYPE_MAX; i++) {\n \t\tif (mapping[i].pctype != 0ULL) {\n \t\t\tfirst_pctype = 1;\n@@ -17751,7 +17751,7 @@ cmd_pctype_mapping_update_parsed(\n {\n \tstruct cmd_pctype_mapping_update_result *res = parsed_result;\n \tint ret = -ENOTSUP;\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tstruct rte_pmd_i40e_flow_type_mapping mapping;\n \tunsigned int i;\n \tunsigned int nb_item;\n@@ -17761,7 +17761,7 @@ cmd_pctype_mapping_update_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tnb_item = parse_item_list(res->pctype_list, \"pctypes\",\n \t\t\t\t  RTE_PMD_I40E_PCTYPE_MAX, pctype_list, 1);\n \tmapping.flow_type = res->flow_type;\n@@ -17849,7 +17849,7 @@ cmd_ptype_mapping_get_parsed(\n {\n \tstruct cmd_ptype_mapping_get_result *res = parsed_result;\n \tint ret = -ENOTSUP;\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tint max_ptype_num = 256;\n \tstruct rte_pmd_i40e_ptype_mapping mapping[max_ptype_num];\n \tuint16_t count;\n@@ -17859,7 +17859,7 @@ cmd_ptype_mapping_get_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_ptype_mapping_get(res->port_id,\n \t\t\t\t\tmapping,\n \t\t\t\t\tmax_ptype_num,\n@@ -17880,7 +17880,7 @@ cmd_ptype_mapping_get_parsed(\n \t\tprintf(\"programming error: (%s)\\n\", strerror(-ret));\n \t}\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (!ret) {\n \t\tfor (i = 0; i < count; i++)\n \t\t\tprintf(\"%3d\\t0x%08x\\n\",\n@@ -17958,7 +17958,7 @@ cmd_ptype_mapping_replace_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_ptype_mapping_replace(res->port_id,\n \t\t\t\t\tres->target,\n \t\t\t\t\tres->mask,\n@@ -18040,7 +18040,7 @@ cmd_ptype_mapping_reset_parsed(\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tret = rte_pmd_i40e_ptype_mapping_reset(res->port_id);\n #endif\n \n@@ -18117,13 +18117,13 @@ cmd_ptype_mapping_update_parsed(\n {\n \tstruct cmd_ptype_mapping_update_result *res = parsed_result;\n \tint ret = -ENOTSUP;\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tstruct rte_pmd_i40e_ptype_mapping mapping;\n #endif\n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n \t\treturn;\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tmapping.hw_ptype = res->hw_ptype;\n \tmapping.sw_ptype = res->sw_ptype;\n \tret = rte_pmd_i40e_ptype_mapping_update(res->port_id,\n@@ -19595,7 +19595,7 @@ cmdline_parse_ctx_t main_ctx[] = {\n \t(cmdline_parse_inst_t *)&cmd_set_bypass_event,\n \t(cmdline_parse_inst_t *)&cmd_set_bypass_timeout,\n \t(cmdline_parse_inst_t *)&cmd_show_bypass_config,\n-#ifdef RTE_LIBRTE_PMD_BOND\n+#ifdef RTE_NET_BOND\n \t(cmdline_parse_inst_t *) &cmd_set_bonding_mode,\n \t(cmdline_parse_inst_t *) &cmd_show_bonding_config,\n \t(cmdline_parse_inst_t *) &cmd_set_bonding_primary,\n@@ -19842,7 +19842,7 @@ cmdline_parse_ctx_t main_ctx[] = {\n \t(cmdline_parse_inst_t *)&cmd_tx_offload_get_configuration,\n \t(cmdline_parse_inst_t *)&cmd_config_per_port_tx_offload,\n \t(cmdline_parse_inst_t *)&cmd_config_per_queue_tx_offload,\n-#ifdef RTE_LIBRTE_BPF\n+#ifdef RTE_LIB_BPF\n \t(cmdline_parse_inst_t *)&cmd_operate_bpf_ld_parse,\n \t(cmdline_parse_inst_t *)&cmd_operate_bpf_unld_parse,\n #endif\ndiff --git a/app/test-pmd/config.c b/app/test-pmd/config.c\nindex 418ea6dda4..ad45b70dc9 100644\n--- a/app/test-pmd/config.c\n+++ b/app/test-pmd/config.c\n@@ -39,13 +39,13 @@\n #include <rte_cycles.h>\n #include <rte_flow.h>\n #include <rte_errno.h>\n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n #include <rte_pmd_ixgbe.h>\n #endif\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n #include <rte_pmd_i40e.h>\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n #include <rte_pmd_bnxt.h>\n #endif\n #include <rte_gro.h>\n@@ -4090,14 +4090,14 @@ get_fdir_info(portid_t port_id, struct rte_eth_fdir_info *fdir_info,\n \t\treturn 0;\n \t}\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tif (ret == -ENOTSUP) {\n \t\tret = rte_pmd_i40e_get_fdir_info(port_id, fdir_info);\n \t\tif (!ret)\n \t\t\tret = rte_pmd_i40e_get_fdir_stats(port_id, fdir_stat);\n \t}\n #endif\n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tif (ret == -ENOTSUP) {\n \t\tret = rte_pmd_ixgbe_get_fdir_info(port_id, fdir_info);\n \t\tif (!ret)\n@@ -4250,7 +4250,7 @@ fdir_set_flex_payload(portid_t port_id, struct rte_eth_flex_payload_cfg *cfg)\n void\n set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on)\n {\n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tint diag;\n \n \tif (is_rx)\n@@ -4305,12 +4305,12 @@ set_vf_rate_limit(portid_t port_id, uint16_t vf, uint16_t rate, uint64_t q_msk)\n \tRTE_SET_USED(rate);\n \tRTE_SET_USED(q_msk);\n \n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \tif (diag == -ENOTSUP)\n \t\tdiag = rte_pmd_ixgbe_set_vf_rate_limit(port_id, vf, rate,\n \t\t\t\t\t\t       q_msk);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \tif (diag == -ENOTSUP)\n \t\tdiag = rte_pmd_bnxt_set_vf_rate_limit(port_id, vf, rate, q_msk);\n #endif\n@@ -4606,7 +4606,7 @@ close_file(uint8_t *buf)\n void\n port_queue_region_info_display(portid_t port_id, void *buf)\n {\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tuint16_t i, j;\n \tstruct rte_pmd_i40e_queue_regions *info =\n \t\t(struct rte_pmd_i40e_queue_regions *)buf;\ndiff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build\nindex 2e8b9f8a99..7e9c7bdd69 100644\n--- a/app/test-pmd/meson.build\n+++ b/app/test-pmd/meson.build\n@@ -25,37 +25,37 @@ sources = files('5tswap.c',\n \t'util.c')\n \n deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']\n-if dpdk_conf.has('RTE_LIBRTE_BITRATESTATS')\n+if dpdk_conf.has('RTE_LIB_BITRATESTATS')\n \tdeps += 'bitratestats'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_PDUMP')\n+if dpdk_conf.has('RTE_LIB_PDUMP')\n \tdeps += 'pdump'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_BITRATESTATS')\n+if dpdk_conf.has('RTE_LIB_BITRATESTATS')\n \tdeps += 'bitratestats'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_LATENCYSTATS')\n+if dpdk_conf.has('RTE_LIB_LATENCYSTATS')\n \tdeps += 'latencystats'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')\n+if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')\n \tdeps += 'crypto_scheduler'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')\n+if dpdk_conf.has('RTE_NET_BOND')\n \tdeps += 'net_bond'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD')\n+if dpdk_conf.has('RTE_NET_BNXT')\n \tdeps += 'net_bnxt'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_I40E_PMD')\n+if dpdk_conf.has('RTE_NET_I40E')\n \tdeps += 'net_i40e'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD')\n+if dpdk_conf.has('RTE_NET_IXGBE')\n \tdeps += 'net_ixgbe'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_DPAA_PMD')\n+if dpdk_conf.has('RTE_NET_DPAA')\n \tdeps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']\n endif\n-if dpdk_conf.has('RTE_LIBRTE_BPF')\n+if dpdk_conf.has('RTE_LIB_BPF')\n \tsources += files('bpf_cmd.c')\n \tdeps += 'bpf'\n endif\ndiff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c\nindex 1ead59579b..98e6740e62 100644\n--- a/app/test-pmd/parameters.c\n+++ b/app/test-pmd/parameters.c\n@@ -39,7 +39,7 @@\n #include <rte_ether.h>\n #include <rte_ethdev.h>\n #include <rte_string_fns.h>\n-#ifdef RTE_LIBRTE_PMD_BOND\n+#ifdef RTE_NET_BOND\n #include <rte_eth_bond.h>\n #endif\n #include <rte_flow.h>\n@@ -50,7 +50,7 @@ static void\n usage(char* progname)\n {\n \tprintf(\"usage: %s [EAL options] -- \"\n-#ifdef RTE_LIBRTE_CMDLINE\n+#ifdef RTE_LIB_CMDLINE\n \t       \"[--interactive|-i] \"\n \t       \"[--cmdline-file=FILENAME] \"\n #endif\n@@ -60,7 +60,7 @@ usage(char* progname)\n \t       \"--portlist=PORTLIST \"\n \t       \"--mbuf-size= | --total-num-mbufs= | \"\n \t       \"--nb-cores= | --nb-ports= | \"\n-#ifdef RTE_LIBRTE_CMDLINE\n+#ifdef RTE_LIB_CMDLINE\n \t       \"--eth-peers-configfile= | \"\n \t       \"--eth-peer=X,M:M:M:M:M:M | \"\n \t       \"--tx-ip=SRC,DST | --tx-udp=PORT | \"\n@@ -73,7 +73,7 @@ usage(char* progname)\n \t       \"--vxlan-gpe-port= | --record-core-cycles | \"\n \t       \"--record-burst-stats]\\n\",\n \t       progname);\n-#ifdef RTE_LIBRTE_CMDLINE\n+#ifdef RTE_LIB_CMDLINE\n \tprintf(\"  --interactive: run in interactive mode.\\n\");\n \tprintf(\"  --cmdline-file: execute cli commands before startup.\\n\");\n #endif\n@@ -112,7 +112,7 @@ usage(char* progname)\n \tprintf(\"  --max-pkt-len=N: set the maximum size of packet to N bytes.\\n\");\n \tprintf(\"  --max-lro-pkt-size=N: set the maximum LRO aggregated packet \"\n \t       \"size to N bytes.\\n\");\n-#ifdef RTE_LIBRTE_CMDLINE\n+#ifdef RTE_LIB_CMDLINE\n \tprintf(\"  --eth-peers-configfile=name: config file with ethernet addresses \"\n \t       \"of peer ports.\\n\");\n \tprintf(\"  --eth-peer=X,M:M:M:M:M:M: set the MAC address of the X peer \"\n@@ -129,7 +129,7 @@ usage(char* progname)\n \t       \"the packet will be enqueued into the rx drop-queue. \"\n \t       \"If the drop-queue doesn't exist, the packet is dropped. \"\n \t       \"By default drop-queue=127.\\n\");\n-#ifdef RTE_LIBRTE_LATENCY_STATS\n+#ifdef RTE_LIB_LATENCYSTATS\n \tprintf(\"  --latencystats=N: enable latency and jitter statistcs \"\n \t       \"monitoring on forwarding lcore id N.\\n\");\n #endif\n@@ -223,7 +223,7 @@ usage(char* progname)\n \tprintf(\"  --record-burst-stats: enable display of RX and TX bursts.\\n\");\n }\n \n-#ifdef RTE_LIBRTE_CMDLINE\n+#ifdef RTE_LIB_CMDLINE\n static int\n init_peer_eth_addrs(char *config_filename)\n {\n@@ -586,7 +586,7 @@ launch_args_parse(int argc, char** argv)\n \n \tstatic struct option lgopts[] = {\n \t\t{ \"help\",\t\t\t0, 0, 0 },\n-#ifdef RTE_LIBRTE_CMDLINE\n+#ifdef RTE_LIB_CMDLINE\n \t\t{ \"interactive\",\t\t0, 0, 0 },\n \t\t{ \"cmdline-file\",\t\t1, 0, 0 },\n \t\t{ \"auto-start\",\t\t\t0, 0, 0 },\n@@ -615,10 +615,10 @@ launch_args_parse(int argc, char** argv)\n \t\t{ \"pkt-filter-report-hash\",     1, 0, 0 },\n \t\t{ \"pkt-filter-size\",            1, 0, 0 },\n \t\t{ \"pkt-filter-drop-queue\",      1, 0, 0 },\n-#ifdef RTE_LIBRTE_LATENCY_STATS\n+#ifdef RTE_LIB_LATENCYSTATS\n \t\t{ \"latencystats\",               1, 0, 0 },\n #endif\n-#ifdef RTE_LIBRTE_BITRATESTATS\n+#ifdef RTE_LIB_BITRATESTATS\n \t\t{ \"bitrate-stats\",              1, 0, 0 },\n #endif\n \t\t{ \"disable-crc-strip\",          0, 0, 0 },\n@@ -691,7 +691,7 @@ launch_args_parse(int argc, char** argv)\n \n \targvopt = argv;\n \n-#ifdef RTE_LIBRTE_CMDLINE\n+#ifdef RTE_LIB_CMDLINE\n #define SHORTOPTS \"i\"\n #else\n #define SHORTOPTS \"\"\n@@ -699,7 +699,7 @@ launch_args_parse(int argc, char** argv)\n \twhile ((opt = getopt_long(argc, argvopt, SHORTOPTS \"ah\",\n \t\t\t\t lgopts, &opt_idx)) != EOF) {\n \t\tswitch (opt) {\n-#ifdef RTE_LIBRTE_CMDLINE\n+#ifdef RTE_LIB_CMDLINE\n \t\tcase 'i':\n \t\t\tprintf(\"Interactive-mode selected\\n\");\n \t\t\tinteractive = 1;\n@@ -715,7 +715,7 @@ launch_args_parse(int argc, char** argv)\n \t\t\t\tusage(argv[0]);\n \t\t\t\trte_exit(EXIT_SUCCESS, \"Displayed help\\n\");\n \t\t\t}\n-#ifdef RTE_LIBRTE_CMDLINE\n+#ifdef RTE_LIB_CMDLINE\n \t\t\tif (!strcmp(lgopts[opt_idx].name, \"interactive\")) {\n \t\t\t\tprintf(\"Interactive-mode selected\\n\");\n \t\t\t\tinteractive = 1;\n@@ -982,7 +982,7 @@ launch_args_parse(int argc, char** argv)\n \t\t\t\t\t\t \"drop queue %d invalid - must\"\n \t\t\t\t\t\t \"be >= 0 \\n\", n);\n \t\t\t}\n-#ifdef RTE_LIBRTE_LATENCY_STATS\n+#ifdef RTE_LIB_LATENCYSTATS\n \t\t\tif (!strcmp(lgopts[opt_idx].name,\n \t\t\t\t    \"latencystats\")) {\n \t\t\t\tn = atoi(optarg);\n@@ -995,7 +995,7 @@ launch_args_parse(int argc, char** argv)\n \t\t\t\t\t\t \" must be >= 0\\n\", n);\n \t\t\t}\n #endif\n-#ifdef RTE_LIBRTE_BITRATESTATS\n+#ifdef RTE_LIB_BITRATESTATS\n \t\t\tif (!strcmp(lgopts[opt_idx].name, \"bitrate-stats\")) {\n \t\t\t\tn = atoi(optarg);\n \t\t\t\tif (n >= 0) {\ndiff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c\nindex ccba71c076..8efe06c64e 100644\n--- a/app/test-pmd/testpmd.c\n+++ b/app/test-pmd/testpmd.c\n@@ -46,18 +46,18 @@\n #include <rte_ethdev.h>\n #include <rte_dev.h>\n #include <rte_string_fns.h>\n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n #include <rte_pmd_ixgbe.h>\n #endif\n-#ifdef RTE_LIBRTE_PDUMP\n+#ifdef RTE_LIB_PDUMP\n #include <rte_pdump.h>\n #endif\n #include <rte_flow.h>\n #include <rte_metrics.h>\n-#ifdef RTE_LIBRTE_BITRATESTATS\n+#ifdef RTE_LIB_BITRATESTATS\n #include <rte_bitrate.h>\n #endif\n-#ifdef RTE_LIBRTE_LATENCY_STATS\n+#ifdef RTE_LIB_LATENCYSTATS\n #include <rte_latencystats.h>\n #endif\n \n@@ -404,13 +404,13 @@ int do_mlockall = 0;\n  * NIC bypass mode configuration options.\n  */\n \n-#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS\n+#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS\n /* The NIC bypass watchdog timeout. */\n uint32_t bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF;\n #endif\n \n \n-#ifdef RTE_LIBRTE_LATENCY_STATS\n+#ifdef RTE_LIB_LATENCYSTATS\n \n /*\n  * Set when latency stats is enabled in the commandline\n@@ -488,7 +488,7 @@ uint8_t record_burst_stats;\n unsigned int num_sockets = 0;\n unsigned int socket_ids[RTE_MAX_NUMA_NODES];\n \n-#ifdef RTE_LIBRTE_BITRATESTATS\n+#ifdef RTE_LIB_BITRATESTATS\n /* Bitrate statistics */\n struct rte_stats_bitrates *bitrate_data;\n lcoreid_t bitrate_lcore_id;\n@@ -2064,7 +2064,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)\n \tstruct fwd_stream **fsm;\n \tstreamid_t nb_fs;\n \tstreamid_t sm_id;\n-#ifdef RTE_LIBRTE_BITRATESTATS\n+#ifdef RTE_LIB_BITRATESTATS\n \tuint64_t tics_per_1sec;\n \tuint64_t tics_datum;\n \tuint64_t tics_current;\n@@ -2079,7 +2079,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)\n \tdo {\n \t\tfor (sm_id = 0; sm_id < nb_fs; sm_id++)\n \t\t\t(*pkt_fwd)(fsm[sm_id]);\n-#ifdef RTE_LIBRTE_BITRATESTATS\n+#ifdef RTE_LIB_BITRATESTATS\n \t\tif (bitrate_enabled != 0 &&\n \t\t\t\tbitrate_lcore_id == rte_lcore_id()) {\n \t\t\ttics_current = rte_rdtsc();\n@@ -2092,7 +2092,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)\n \t\t\t}\n \t\t}\n #endif\n-#ifdef RTE_LIBRTE_LATENCY_STATS\n+#ifdef RTE_LIB_LATENCYSTATS\n \t\tif (latencystats_enabled != 0 &&\n \t\t\t\tlatencystats_lcore_id == rte_lcore_id())\n \t\t\trte_latencystats_update();\n@@ -3347,7 +3347,7 @@ init_port_config(void)\n \t\t\treturn;\n \n \t\tmap_port_queue_stats_mapping_registers(pid, port);\n-#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS\n+#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS\n \t\trte_pmd_ixgbe_bypass_init(pid);\n #endif\n \n@@ -3613,11 +3613,11 @@ signal_handler(int signum)\n \tif (signum == SIGINT || signum == SIGTERM) {\n \t\tprintf(\"\\nSignal %d received, preparing to exit...\\n\",\n \t\t\t\tsignum);\n-#ifdef RTE_LIBRTE_PDUMP\n+#ifdef RTE_LIB_PDUMP\n \t\t/* uninitialize packet capture framework */\n \t\trte_pdump_uninit();\n #endif\n-#ifdef RTE_LIBRTE_LATENCY_STATS\n+#ifdef RTE_LIB_LATENCYSTATS\n \t\tif (latencystats_enabled != 0)\n \t\t\trte_latencystats_uninit();\n #endif\n@@ -3659,7 +3659,7 @@ main(int argc, char** argv)\n \tif (ret != 0)\n \t\trte_exit(EXIT_FAILURE, \"Cannot register for ethdev events\");\n \n-#ifdef RTE_LIBRTE_PDUMP\n+#ifdef RTE_LIB_PDUMP\n \t/* initialize packet capture framework */\n \trte_pdump_init();\n #endif\n@@ -3682,10 +3682,10 @@ main(int argc, char** argv)\n \t\t\t \"Check the core mask argument\\n\");\n \n \t/* Bitrate/latency stats disabled by default */\n-#ifdef RTE_LIBRTE_BITRATESTATS\n+#ifdef RTE_LIB_BITRATESTATS\n \tbitrate_enabled = 0;\n #endif\n-#ifdef RTE_LIBRTE_LATENCY_STATS\n+#ifdef RTE_LIB_LATENCYSTATS\n \tlatencystats_enabled = 0;\n #endif\n \n@@ -3764,7 +3764,7 @@ main(int argc, char** argv)\n \t/* Init metrics library */\n \trte_metrics_init(rte_socket_id());\n \n-#ifdef RTE_LIBRTE_LATENCY_STATS\n+#ifdef RTE_LIB_LATENCYSTATS\n \tif (latencystats_enabled != 0) {\n \t\tint ret = rte_latencystats_init(1, NULL);\n \t\tif (ret)\n@@ -3776,7 +3776,7 @@ main(int argc, char** argv)\n #endif\n \n \t/* Setup bitrate stats */\n-#ifdef RTE_LIBRTE_BITRATESTATS\n+#ifdef RTE_LIB_BITRATESTATS\n \tif (bitrate_enabled != 0) {\n \t\tbitrate_data = rte_stats_bitrate_create();\n \t\tif (bitrate_data == NULL)\n@@ -3786,7 +3786,7 @@ main(int argc, char** argv)\n \t}\n #endif\n \n-#ifdef RTE_LIBRTE_CMDLINE\n+#ifdef RTE_LIB_CMDLINE\n \tif (strlen(cmdline_filename) != 0)\n \t\tcmdline_read_from_file(cmdline_filename);\n \ndiff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h\nindex c7e7e41a97..660847c948 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -398,12 +398,12 @@ extern uint32_t param_total_num_mbufs;\n \n extern uint16_t stats_period;\n \n-#ifdef RTE_LIBRTE_LATENCY_STATS\n+#ifdef RTE_LIB_LATENCYSTATS\n extern uint8_t latencystats_enabled;\n extern lcoreid_t latencystats_lcore_id;\n #endif\n \n-#ifdef RTE_LIBRTE_BITRATESTATS\n+#ifdef RTE_LIB_BITRATESTATS\n extern lcoreid_t bitrate_lcore_id;\n extern uint8_t bitrate_enabled;\n #endif\ndiff --git a/app/test/meson.build b/app/test/meson.build\nindex d3ae9c91ac..5ea7265d47 100644\n--- a/app/test/meson.build\n+++ b/app/test/meson.build\n@@ -337,35 +337,35 @@ dump_test_names = [\n # unit tests without requiring that the developer install the\n # DPDK libraries.  Explicit linkage of drivers (plugin libraries)\n # in applications should not be used.\n-if dpdk_conf.has('RTE_LIBRTE_RING_MEMPOOL')\n+if dpdk_conf.has('RTE_MEMPOOL_RING')\n \ttest_deps += 'mempool_ring'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_STACK_MEMPOOL')\n+if dpdk_conf.has('RTE_MEMPOOL_STACK')\n \ttest_deps += 'mempool_stack'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_SKELETON_EVENTDEV_PMD')\n+if dpdk_conf.has('RTE_EVENT_SKELETON')\n \ttest_deps += 'event_skeleton'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')\n+if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')\n \ttest_deps += 'crypto_scheduler'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_TELEMETRY')\n+if dpdk_conf.has('RTE_LIB_TELEMETRY')\n \ttest_sources += 'test_telemetry_json.c'\n \tfast_tests += [['telemetry_json_autotest', true]]\n endif\n \n # The following linkages of drivers are required because\n # they are used via a driver-specific API.\n-if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')\n+if dpdk_conf.has('RTE_NET_BOND')\n \ttest_deps += 'net_bond'\n \ttest_sources += ['test_link_bonding.c', 'test_link_bonding_rssconf.c']\n \tdriver_test_names += ['link_bonding_autotest', 'link_bonding_rssconf_autotest']\n-\tif dpdk_conf.has('RTE_LIBRTE_RING_PMD')\n+\tif dpdk_conf.has('RTE_NET_RING')\n \t\ttest_sources += 'test_link_bonding_mode4.c'\n \t\tdriver_test_names += 'link_bonding_mode4_autotest'\n \tendif\n endif\n-if dpdk_conf.has('RTE_LIBRTE_RING_PMD')\n+if dpdk_conf.has('RTE_NET_RING')\n \ttest_deps += 'net_ring'\n \ttest_sources += 'test_pmd_ring_perf.c'\n \ttest_sources += 'test_pmd_ring.c'\n@@ -382,13 +382,13 @@ if dpdk_conf.has('RTE_LIBRTE_RING_PMD')\n \tfast_tests += [['pdump_autotest', true]]\n endif\n \n-if dpdk_conf.has('RTE_LIBRTE_POWER')\n+if dpdk_conf.has('RTE_LIB_POWER')\n \ttest_deps += 'power'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_KNI')\n+if dpdk_conf.has('RTE_LIB_KNI')\n \ttest_deps += 'kni'\n endif\n-if dpdk_conf.has('RTE_LIBRTE_PDUMP')\n+if dpdk_conf.has('RTE_LIB_PDUMP')\n \ttest_deps += 'pdump'\n endif\n \n@@ -405,7 +405,7 @@ cflags += '-fno-strict-aliasing'\n cflags += ['-DALLOW_INTERNAL_API']\n \n test_dep_objs = []\n-if dpdk_conf.has('RTE_LIBRTE_COMPRESSDEV')\n+if dpdk_conf.has('RTE_LIB_COMPRESSDEV')\n \tcompress_test_dep = dependency('zlib', required: false)\n \tif compress_test_dep.found()\n \t\ttest_dep_objs += compress_test_dep\n@@ -415,7 +415,7 @@ if dpdk_conf.has('RTE_LIBRTE_COMPRESSDEV')\n \tendif\n endif\n \n-if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')\n+if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')\n \tdriver_test_names += 'cryptodev_scheduler_autotest'\n endif\n \ndiff --git a/app/test/process.h b/app/test/process.h\nindex c3b3780337..27f1b1c0e6 100644\n--- a/app/test/process.h\n+++ b/app/test/process.h\n@@ -24,8 +24,8 @@\n #define exe \"exe\"\n #endif\n \n-#ifdef RTE_LIBRTE_PDUMP\n-#ifdef RTE_LIBRTE_RING_PMD\n+#ifdef RTE_LIB_PDUMP\n+#ifdef RTE_NET_RING\n #include <pthread.h>\n extern void *send_pkts(void *empty);\n extern uint16_t flag_for_send_pkts;\n@@ -45,8 +45,8 @@ process_dup(const char *const argv[], int numargs, const char *env_value)\n \tchar *argv_cpy[numargs + 1];\n \tint i, status;\n \tchar path[32];\n-#ifdef RTE_LIBRTE_PDUMP\n-#ifdef RTE_LIBRTE_RING_PMD\n+#ifdef RTE_LIB_PDUMP\n+#ifdef RTE_NET_RING\n \tpthread_t thread;\n #endif\n #endif\n@@ -124,8 +124,8 @@ process_dup(const char *const argv[], int numargs, const char *env_value)\n \t\t}\n \t}\n \t/* parent process does a wait */\n-#ifdef RTE_LIBRTE_PDUMP\n-#ifdef RTE_LIBRTE_RING_PMD\n+#ifdef RTE_LIB_PDUMP\n+#ifdef RTE_NET_RING\n \tif ((strcmp(env_value, \"run_pdump_server_tests\") == 0))\n \t\tpthread_create(&thread, NULL, &send_pkts, NULL);\n #endif\n@@ -133,8 +133,8 @@ process_dup(const char *const argv[], int numargs, const char *env_value)\n \n \twhile (wait(&status) != pid)\n \t\t;\n-#ifdef RTE_LIBRTE_PDUMP\n-#ifdef RTE_LIBRTE_RING_PMD\n+#ifdef RTE_LIB_PDUMP\n+#ifdef RTE_NET_RING\n \tif ((strcmp(env_value, \"run_pdump_server_tests\") == 0)) {\n \t\tflag_for_send_pkts = 0;\n \t\tpthread_join(thread, NULL);\ndiff --git a/app/test/test.c b/app/test/test.c\nindex 94d26ab1f6..afabfe42fc 100644\n--- a/app/test/test.c\n+++ b/app/test/test.c\n@@ -12,7 +12,7 @@\n #include <ctype.h>\n #include <sys/queue.h>\n \n-#ifdef RTE_LIBRTE_CMDLINE\n+#ifdef RTE_LIB_CMDLINE\n #include <cmdline_rdline.h>\n #include <cmdline_parse.h>\n #include <cmdline_socket.h>\n@@ -25,12 +25,12 @@ extern cmdline_parse_ctx_t main_ctx[];\n #include <rte_cycles.h>\n #include <rte_log.h>\n #include <rte_string_fns.h>\n-#ifdef RTE_LIBRTE_TIMER\n+#ifdef RTE_LIB_TIMER\n #include <rte_timer.h>\n #endif\n \n #include \"test.h\"\n-#ifdef RTE_LIBRTE_PDUMP\n+#ifdef RTE_LIB_PDUMP\n #include \"test_pdump.h\"\n #endif\n \n@@ -52,8 +52,8 @@ do_recursive_call(void)\n \t\tint (*action_fn)(void);\n \t} actions[] =  {\n \t\t\t{ \"run_secondary_instances\", test_mp_secondary },\n-#ifdef RTE_LIBRTE_PDUMP\n-#ifdef RTE_LIBRTE_RING_PMD\n+#ifdef RTE_LIB_PDUMP\n+#ifdef RTE_NET_RING\n \t\t\t{ \"run_pdump_server_tests\", test_pdump },\n #endif\n #endif\n@@ -69,7 +69,7 @@ do_recursive_call(void)\n \t\t\t{ \"test_memory_flags\", no_action },\n \t\t\t{ \"test_file_prefix\", no_action },\n \t\t\t{ \"test_no_huge_flag\", no_action },\n-#ifdef RTE_LIBRTE_TIMER\n+#ifdef RTE_LIB_TIMER\n \t\t\t{ \"timer_secondary_spawn_wait\", test_timer_secondary },\n #endif\n \t};\n@@ -91,7 +91,7 @@ int last_test_result;\n int\n main(int argc, char **argv)\n {\n-#ifdef RTE_LIBRTE_CMDLINE\n+#ifdef RTE_LIB_CMDLINE\n \tstruct cmdline *cl;\n #endif\n \tchar *extra_args;\n@@ -134,7 +134,7 @@ main(int argc, char **argv)\n \t\tgoto out;\n \t}\n \n-#ifdef RTE_LIBRTE_TIMER\n+#ifdef RTE_LIB_TIMER\n \tif (rte_timer_subsystem_init() < 0) {\n \t\tret = -1;\n \t\tgoto out;\n@@ -163,7 +163,7 @@ main(int argc, char **argv)\n \t\t\t\t\"HPET is not enabled, using TSC as default timer\\n\");\n \n \n-#ifdef RTE_LIBRTE_CMDLINE\n+#ifdef RTE_LIB_CMDLINE\n \tcl = cmdline_stdin_new(main_ctx, \"RTE>>\");\n \tif (cl == NULL) {\n \t\tret = -1;\n@@ -191,7 +191,7 @@ main(int argc, char **argv)\n \tret = 0;\n \n out:\n-#ifdef RTE_LIBRTE_TIMER\n+#ifdef RTE_LIB_TIMER\n \trte_timer_subsystem_finalize();\n #endif\n \trte_eal_cleanup();\ndiff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c\nindex 153d001194..687a8830a7 100644\n--- a/app/test/test_cryptodev.c\n+++ b/app/test/test_cryptodev.c\n@@ -18,7 +18,7 @@\n #include <rte_cryptodev_pmd.h>\n #include <rte_string_fns.h>\n \n-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER\n+#ifdef RTE_CRYPTO_SCHEDULER\n #include <rte_cryptodev_scheduler.h>\n #include <rte_cryptodev_scheduler_operations.h>\n #endif\n@@ -40,7 +40,7 @@\n #include \"test_cryptodev_aead_test_vectors.h\"\n #include \"test_cryptodev_hmac_test_vectors.h\"\n #include \"test_cryptodev_mixed_test_vectors.h\"\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #include \"test_cryptodev_security_pdcp_test_vectors.h\"\n #include \"test_cryptodev_security_pdcp_test_func.h\"\n #include \"test_cryptodev_security_docsis_test_vectors.h\"\n@@ -74,17 +74,17 @@ struct crypto_unittest_params {\n \tstruct rte_crypto_sym_xform cipher_xform;\n \tstruct rte_crypto_sym_xform auth_xform;\n \tstruct rte_crypto_sym_xform aead_xform;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tstruct rte_security_docsis_xform docsis_xform;\n #endif\n \n \tunion {\n \t\tstruct rte_cryptodev_sym_session *sess;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\tstruct rte_security_session *sec_session;\n #endif\n \t};\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tenum rte_security_session_action_type type;\n #endif\n \tstruct rte_crypto_op *op;\n@@ -475,7 +475,7 @@ testsuite_setup(void)\n \t\t}\n \t}\n \n-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER\n+#ifdef RTE_CRYPTO_SCHEDULER\n \tchar vdev_args[VDEV_ARGS_SIZE] = {\"\"};\n \tchar temp_str[VDEV_ARGS_SIZE] = {\"mode=multi-core,\"\n \t\t\"ordering=enable,name=cryptodev_test_scheduler,corelist=\"};\n@@ -522,7 +522,7 @@ testsuite_setup(void)\n \t\t\t\ti, RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD));\n \t\t}\n \t}\n-#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */\n+#endif /* RTE_CRYPTO_SCHEDULER */\n \n \tnb_devs = rte_cryptodev_count();\n \tif (nb_devs < 1) {\n@@ -695,7 +695,7 @@ ut_teardown(void)\n \tstruct rte_cryptodev_stats stats;\n \n \t/* free crypto session structure */\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tif (ut_params->type == RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL) {\n \t\tif (ut_params->sec_session) {\n \t\t\trte_security_session_destroy(rte_cryptodev_get_sec_ctx\n@@ -7085,7 +7085,7 @@ test_authenticated_encryption(const struct aead_test_data *tdata)\n \n }\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static int\n security_proto_supported(enum rte_security_session_action_type action,\n \tenum rte_security_session_protocol proto)\n@@ -11710,7 +11710,7 @@ test_chacha20_poly1305_decrypt_test_case_rfc8439(void)\n \treturn test_authenticated_decryption(&chacha20_poly1305_case_rfc8439);\n }\n \n-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER\n+#ifdef RTE_CRYPTO_SCHEDULER\n \n /* global AESNI slave IDs for the scheduler test */\n uint8_t aesni_ids[2];\n@@ -11930,7 +11930,7 @@ static struct unit_test_suite cryptodev_scheduler_testsuite  = {\n \t}\n };\n \n-#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */\n+#endif /* RTE_CRYPTO_SCHEDULER */\n \n static struct unit_test_suite cryptodev_testsuite  = {\n \t.suite_name = \"Crypto Unit Test Suite\",\n@@ -12551,7 +12551,7 @@ static struct unit_test_suite cryptodev_testsuite  = {\n \t\tTEST_CASE_ST(ut_setup, ut_teardown,\n \t\t\ttest_verify_auth_aes_cmac_cipher_null_test_case_1),\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\tTEST_CASE_ST(ut_setup_security, ut_teardown,\n \t\t\ttest_PDCP_PROTO_all),\n \t\tTEST_CASE_ST(ut_setup_security, ut_teardown,\n@@ -12877,7 +12877,7 @@ test_cryptodev_mrvl(void)\n \treturn unit_test_suite_runner(&cryptodev_mrvl_testsuite);\n }\n \n-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER\n+#ifdef RTE_CRYPTO_SCHEDULER\n \n static int\n test_cryptodev_scheduler(void /*argv __rte_unused, int argc __rte_unused*/)\ndiff --git a/app/test/test_cryptodev_hash_test_vectors.h b/app/test/test_cryptodev_hash_test_vectors.h\nindex d11d7cee7e..e261dfe36c 100644\n--- a/app/test/test_cryptodev_hash_test_vectors.h\n+++ b/app/test/test_cryptodev_hash_test_vectors.h\n@@ -5,7 +5,7 @@\n #ifndef TEST_CRYPTODEV_HASH_TEST_VECTORS_H_\n #define TEST_CRYPTODEV_HASH_TEST_VECTORS_H_\n \n-#ifdef RTE_LIBRTE_PMD_AESNI_MB\n+#ifdef RTE_CRYPTO_AESNI_MB\n #include <intel-ipsec-mb.h>\n #endif\n \ndiff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c\nindex b019656b29..fc7d1a2f02 100644\n--- a/app/test/test_eal_flags.c\n+++ b/app/test/test_eal_flags.c\n@@ -344,7 +344,7 @@ test_invalid_b_flag(void)\n static int\n test_invalid_vdev_flag(void)\n {\n-#ifdef RTE_LIBRTE_PMD_RING\n+#ifdef RTE_NET_RING\n #ifdef RTE_EXEC_ENV_FREEBSD\n \t/* BSD target doesn't support prefixes at this point, and we also need to\n \t * run another primary process here */\n@@ -1504,7 +1504,7 @@ test_eal_flags(void)\n \t\treturn ret;\n \t}\n \n-#ifdef RTE_LIBRTE_PMD_RING\n+#ifdef RTE_NET_RING\n \tret = test_invalid_vdev_flag();\n \tif (ret < 0) {\n \t\tprintf(\"Error in test_invalid_vdev_flag()\\n\");\ndiff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c\nindex f5ddd03d76..2a0c134a99 100644\n--- a/app/test/test_func_reentrancy.c\n+++ b/app/test/test_func_reentrancy.c\n@@ -27,15 +27,15 @@\n #include <rte_spinlock.h>\n #include <rte_malloc.h>\n \n-#ifdef RTE_LIBRTE_HASH\n+#ifdef RTE_LIB_HASH\n #include <rte_hash.h>\n #include <rte_fbk_hash.h>\n #include <rte_jhash.h>\n-#endif /* RTE_LIBRTE_HASH */\n+#endif /* RTE_LIB_HASH */\n \n-#ifdef RTE_LIBRTE_LPM\n+#ifdef RTE_LIB_LPM\n #include <rte_lpm.h>\n-#endif /* RTE_LIBRTE_LPM */\n+#endif /* RTE_LIB_LPM */\n \n #include <rte_string_fns.h>\n \n@@ -200,7 +200,7 @@ mempool_create_lookup(__rte_unused void *arg)\n \treturn 0;\n }\n \n-#ifdef RTE_LIBRTE_HASH\n+#ifdef RTE_LIB_HASH\n static void\n hash_clean(unsigned lcore_id)\n {\n@@ -328,9 +328,9 @@ fbk_create_free(__rte_unused void *arg)\n \n \treturn 0;\n }\n-#endif /* RTE_LIBRTE_HASH */\n+#endif /* RTE_LIB_HASH */\n \n-#ifdef RTE_LIBRTE_LPM\n+#ifdef RTE_LIB_LPM\n static void\n lpm_clean(unsigned int lcore_id)\n {\n@@ -388,7 +388,7 @@ lpm_create_free(__rte_unused void *arg)\n \n \treturn 0;\n }\n-#endif /* RTE_LIBRTE_LPM */\n+#endif /* RTE_LIB_LPM */\n \n struct test_case{\n \tcase_func_t    func;\n@@ -403,13 +403,13 @@ struct test_case test_cases[] = {\n \t{ ring_create_lookup,     NULL,  ring_clean,   \"ring create/lookup\" },\n \t{ mempool_create_lookup,  NULL,  mempool_clean,\n \t\t\t\"mempool create/lookup\" },\n-#ifdef RTE_LIBRTE_HASH\n+#ifdef RTE_LIB_HASH\n \t{ hash_create_free,       NULL,  hash_clean,   \"hash create/free\" },\n \t{ fbk_create_free,        NULL,  fbk_clean,    \"fbk create/free\" },\n-#endif /* RTE_LIBRTE_HASH */\n-#ifdef RTE_LIBRTE_LPM\n+#endif /* RTE_LIB_HASH */\n+#ifdef RTE_LIB_LPM\n \t{ lpm_create_free,        NULL,  lpm_clean,    \"lpm create/free\" },\n-#endif /* RTE_LIBRTE_LPM */\n+#endif /* RTE_LIB_LPM */\n };\n \n /**\ndiff --git a/app/test/test_kni.c b/app/test/test_kni.c\nindex e47ab36e02..402f170649 100644\n--- a/app/test/test_kni.c\n+++ b/app/test/test_kni.c\n@@ -11,7 +11,7 @@\n \n #include \"test.h\"\n \n-#if !defined(RTE_EXEC_ENV_LINUX) || !defined(RTE_LIBRTE_KNI)\n+#if !defined(RTE_EXEC_ENV_LINUX) || !defined(RTE_LIB_KNI)\n \n static int\n test_kni(void)\ndiff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c\nindex 3a655c3400..e1a7b4ae45 100644\n--- a/app/test/test_mp_secondary.c\n+++ b/app/test/test_mp_secondary.c\n@@ -34,14 +34,14 @@\n #include <rte_log.h>\n #include <rte_mempool.h>\n \n-#ifdef RTE_LIBRTE_HASH\n+#ifdef RTE_LIB_HASH\n #include <rte_hash.h>\n #include <rte_fbk_hash.h>\n-#endif /* RTE_LIBRTE_HASH */\n+#endif /* RTE_LIB_HASH */\n \n-#ifdef RTE_LIBRTE_LPM\n+#ifdef RTE_LIB_LPM\n #include <rte_lpm.h>\n-#endif /* RTE_LIBRTE_LPM */\n+#endif /* RTE_LIB_LPM */\n \n #include <rte_string_fns.h>\n \n@@ -157,7 +157,7 @@ run_object_creation_tests(void)\n \t}\n \tprintf(\"# Checked rte_mempool_create() OK\\n\");\n \n-#ifdef RTE_LIBRTE_HASH\n+#ifdef RTE_LIB_HASH\n \tconst struct rte_hash_parameters hash_params = { .name = \"test_mp_hash\" };\n \trte_errno=0;\n \tif ((rte_hash_create(&hash_params) != NULL) &&\n@@ -177,7 +177,7 @@ run_object_creation_tests(void)\n \tprintf(\"# Checked rte_fbk_hash_create() OK\\n\");\n #endif\n \n-#ifdef RTE_LIBRTE_LPM\n+#ifdef RTE_LIB_LPM\n \trte_errno=0;\n \tstruct rte_lpm_config config;\n \ndiff --git a/app/test/test_power.c b/app/test/test_power.c\nindex 0c597c33f1..da1d67c0ab 100644\n--- a/app/test/test_power.c\n+++ b/app/test/test_power.c\n@@ -11,7 +11,7 @@\n \n #include \"test.h\"\n \n-#ifndef RTE_LIBRTE_POWER\n+#ifndef RTE_LIB_POWER\n \n static int\n test_power(void)\ndiff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c\nindex d203810da9..731c6b4dc8 100644\n--- a/app/test/test_power_cpufreq.c\n+++ b/app/test/test_power_cpufreq.c\n@@ -11,7 +11,7 @@\n \n #include \"test.h\"\n \n-#ifndef RTE_LIBRTE_POWER\n+#ifndef RTE_LIB_POWER\n \n static int\n test_power_cpufreq(void)\ndiff --git a/app/test/test_power_kvm_vm.c b/app/test/test_power_kvm_vm.c\nindex 785cd048df..cc66b7a8a0 100644\n--- a/app/test/test_power_kvm_vm.c\n+++ b/app/test/test_power_kvm_vm.c\n@@ -10,7 +10,7 @@\n \n #include \"test.h\"\n \n-#ifndef RTE_LIBRTE_POWER\n+#ifndef RTE_LIB_POWER\n \n static int\n test_power_kvm_vm(void)\ndiff --git a/app/test/test_table.c b/app/test/test_table.c\nindex bc8d8a2e10..95034148cb 100644\n--- a/app/test/test_table.c\n+++ b/app/test/test_table.c\n@@ -180,7 +180,7 @@ test_table(void)\n \t\t}\n \t}\n \n-#ifdef RTE_LIBRTE_ACL\n+#ifdef RTE_LIB_ACL\n \tprintf(\"\\n\\n\\n\\n************ACL tests************\\n\");\n \tif (test_table_acl() < 0) {\n \t\tret = TEST_FAILED;\ndiff --git a/app/test/test_table.h b/app/test/test_table.h\nindex 43b8855874..209bdbff2c 100644\n--- a/app/test/test_table.h\n+++ b/app/test/test_table.h\n@@ -10,7 +10,7 @@\n #include <rte_table_array.h>\n #include <rte_pipeline.h>\n \n-#ifdef RTE_LIBRTE_ACL\n+#ifdef RTE_LIB_ACL\n #include <rte_table_acl.h>\n #endif\n \ndiff --git a/app/test/test_table_combined.h b/app/test/test_table_combined.h\nindex d05866240f..fb94dbb94d 100644\n--- a/app/test/test_table_combined.h\n+++ b/app/test/test_table_combined.h\n@@ -6,7 +6,7 @@\n int test_table_stub_combined(void);\n int test_table_lpm_combined(void);\n int test_table_lpm_ipv6_combined(void);\n-#ifdef RTE_LIBRTE_ACL\n+#ifdef RTE_LIB_ACL\n int test_table_acl(void);\n #endif\n int test_table_hash8unoptimized(void);\ndiff --git a/app/test/test_table_tables.h b/app/test/test_table_tables.h\nindex 7570e99639..530633a013 100644\n--- a/app/test/test_table_tables.h\n+++ b/app/test/test_table_tables.h\n@@ -7,7 +7,7 @@ int test_table_hash_cuckoo(void);\n int test_table_lpm(void);\n int test_table_lpm_ipv6(void);\n int test_table_array(void);\n-#ifdef RTE_LIBRTE_ACL\n+#ifdef RTE_LIB_ACL\n int test_table_acl(void);\n #endif\n int test_table_hash_unoptimized(void);\ndiff --git a/config/arm/meson.build b/config/arm/meson.build\nindex 42c0c34a57..a7c5e4dd00 100644\n--- a/config/arm/meson.build\n+++ b/config/arm/meson.build\n@@ -21,9 +21,9 @@ flags_common_default = [\n \t#\t['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF],\n \t#\t['RTE_ARM64_MEMCPY_STRICT_ALIGN', false],\n \n-\t['RTE_LIBRTE_FM10K_PMD', false],\n-\t['RTE_LIBRTE_SFC_EFX_PMD', false],\n-\t['RTE_LIBRTE_AVP_PMD', false],\n+\t['RTE_NET_FM10K', false],\n+\t['RTE_NET_SFC_EFX', false],\n+\t['RTE_NET_AVP', false],\n \n \t['RTE_SCHED_VECTOR', false],\n \t['RTE_ARM_USE_WFE', false],\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\nindex 97be761164..08836090d2 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\n@@ -120,7 +120,7 @@ dpaa2_core_cluster_sdest(int cpu_id)\n \treturn dpaa2_core_cluster_base + x;\n }\n \n-#ifdef RTE_LIBRTE_PMD_DPAA2_EVENTDEV\n+#ifdef RTE_EVENT_DPAA2\n static void\n dpaa2_affine_dpio_intr_to_respective_core(int32_t dpio_id, int cpu_id)\n {\n@@ -242,7 +242,7 @@ dpaa2_configure_stashing(struct dpaa2_dpio_dev *dpio_dev, int cpu_id)\n \t\treturn -1;\n \t}\n \n-#ifdef RTE_LIBRTE_PMD_DPAA2_EVENTDEV\n+#ifdef RTE_EVENT_DPAA2\n \tif (dpaa2_dpio_intr_init(dpio_dev, cpu_id)) {\n \t\tDPAA2_BUS_ERR(\"Interrupt registration failed for dpio\");\n \t\treturn -1;\n@@ -255,7 +255,7 @@ dpaa2_configure_stashing(struct dpaa2_dpio_dev *dpio_dev, int cpu_id)\n static void dpaa2_put_qbman_swp(struct dpaa2_dpio_dev *dpio_dev)\n {\n \tif (dpio_dev) {\n-#ifdef RTE_LIBRTE_PMD_DPAA2_EVENTDEV\n+#ifdef RTE_EVENT_DPAA2\n \t\tdpaa2_dpio_intr_deinit(dpio_dev);\n #endif\n \t\trte_atomic16_clear(&dpio_dev->ref_count);\ndiff --git a/drivers/compress/qat/qat_comp.h b/drivers/compress/qat/qat_comp.h\nindex 1c07f2233e..0444b50a1e 100644\n--- a/drivers/compress/qat/qat_comp.h\n+++ b/drivers/compress/qat/qat_comp.h\n@@ -5,7 +5,7 @@\n #ifndef _QAT_COMP_H_\n #define _QAT_COMP_H_\n \n-#ifdef RTE_LIBRTE_COMPRESSDEV\n+#ifdef RTE_LIB_COMPRESSDEV\n \n #include <rte_compressdev.h>\n #include <rte_compressdev_pmd.h>\ndiff --git a/drivers/compress/qat/qat_comp_pmd.h b/drivers/compress/qat/qat_comp_pmd.h\nindex ed27120604..252b4b24e3 100644\n--- a/drivers/compress/qat/qat_comp_pmd.h\n+++ b/drivers/compress/qat/qat_comp_pmd.h\n@@ -5,7 +5,7 @@\n #ifndef _QAT_COMP_PMD_H_\n #define _QAT_COMP_PMD_H_\n \n-#ifdef RTE_LIBRTE_COMPRESSDEV\n+#ifdef RTE_LIB_COMPRESSDEV\n \n #include <rte_compressdev.h>\n #include <rte_compressdev_pmd.h>\ndiff --git a/drivers/crypto/aesni_mb/aesni_mb_pmd_private.h b/drivers/crypto/aesni_mb/aesni_mb_pmd_private.h\nindex e0c7b4f7cc..8e9b8bca29 100644\n--- a/drivers/crypto/aesni_mb/aesni_mb_pmd_private.h\n+++ b/drivers/crypto/aesni_mb/aesni_mb_pmd_private.h\n@@ -7,7 +7,7 @@\n \n #include <intel-ipsec-mb.h>\n \n-#if defined(RTE_LIBRTE_SECURITY) && (IMB_VERSION_NUM) >= IMB_VERSION(0, 54, 0)\n+#if defined(RTE_LIB_SECURITY) && (IMB_VERSION_NUM) >= IMB_VERSION(0, 54, 0)\n #define AESNI_MB_DOCSIS_SEC_ENABLED 1\n #include <rte_security.h>\n #include <rte_security_driver.h>\ndiff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\nindex 109e61ae16..41401c6f08 100644\n--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\n+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\n@@ -58,7 +58,7 @@\n \n static uint8_t cryptodev_driver_id;\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static inline int\n build_proto_compound_sg_fd(dpaa2_sec_session *sess,\n \t\t\t   struct rte_crypto_op *op,\n@@ -1355,7 +1355,7 @@ build_sec_fd(struct rte_crypto_op *op,\n \tif (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION)\n \t\tsess = (dpaa2_sec_session *)get_sym_session_private_data(\n \t\t\t\top->sym->session, cryptodev_driver_id);\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \telse if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION)\n \t\tsess = (dpaa2_sec_session *)get_sec_session_private_data(\n \t\t\t\top->sym->sec_session);\n@@ -1383,7 +1383,7 @@ build_sec_fd(struct rte_crypto_op *op,\n \t\tcase DPAA2_SEC_CIPHER_HASH:\n \t\t\tret = build_authenc_sg_fd(sess, op, fd, bpid);\n \t\t\tbreak;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\tcase DPAA2_SEC_IPSEC:\n \t\tcase DPAA2_SEC_PDCP:\n \t\t\tret = build_proto_compound_sg_fd(sess, op, fd, bpid);\n@@ -1407,7 +1407,7 @@ build_sec_fd(struct rte_crypto_op *op,\n \t\tcase DPAA2_SEC_CIPHER_HASH:\n \t\t\tret = build_authenc_fd(sess, op, fd, bpid);\n \t\t\tbreak;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\tcase DPAA2_SEC_IPSEC:\n \t\t\tret = build_proto_fd(sess, op, fd, bpid);\n \t\t\tbreak;\n@@ -1522,7 +1522,7 @@ dpaa2_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \treturn num_tx;\n }\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static inline struct rte_crypto_op *\n sec_simple_fd_to_mbuf(const struct qbman_fd *fd)\n {\n@@ -1561,7 +1561,7 @@ sec_fd_to_mbuf(const struct qbman_fd *fd)\n \tstruct ctxt_priv *priv;\n \tstruct rte_mbuf *dst, *src;\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tif (DPAA2_FD_GET_FORMAT(fd) == qbman_fd_single)\n \t\treturn sec_simple_fd_to_mbuf(fd);\n #endif\n@@ -1594,7 +1594,7 @@ sec_fd_to_mbuf(const struct qbman_fd *fd)\n \t} else\n \t\tdst = src;\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tif (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) {\n \t\tuint16_t len = DPAA2_GET_FD_LEN(fd);\n \t\tdst->pkt_len = len;\n@@ -2539,7 +2539,7 @@ dpaa2_sec_set_session_parameters(struct rte_cryptodev *dev,\n \treturn ret;\n }\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static int\n dpaa2_sec_ipsec_aead_init(struct rte_crypto_aead_xform *aead_xform,\n \t\t\tdpaa2_sec_session *session,\n@@ -3698,7 +3698,7 @@ static struct rte_cryptodev_ops crypto_ops = {\n \t.sym_session_clear        = dpaa2_sec_sym_session_clear,\n };\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static const struct rte_security_capability *\n dpaa2_sec_capabilities_get(void *device __rte_unused)\n {\n@@ -3736,7 +3736,7 @@ dpaa2_sec_dev_init(struct rte_cryptodev *cryptodev)\n \tstruct dpaa2_sec_dev_private *internals;\n \tstruct rte_device *dev = cryptodev->device;\n \tstruct rte_dpaa2_device *dpaa2_dev;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tstruct rte_security_ctx *security_instance;\n #endif\n \tstruct fsl_mc_io *dpseci;\n@@ -3775,7 +3775,7 @@ dpaa2_sec_dev_init(struct rte_cryptodev *cryptodev)\n \t\tDPAA2_SEC_DEBUG(\"Device already init by primary process\");\n \t\treturn 0;\n \t}\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t/* Initialize security_ctx only for primary process*/\n \tsecurity_instance = rte_malloc(\"rte_security_instances_ops\",\n \t\t\t\tsizeof(struct rte_security_ctx), 0);\ndiff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h\nindex 528b64ef88..5d9cf12c4a 100644\n--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h\n+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h\n@@ -8,7 +8,7 @@\n #ifndef _DPAA2_SEC_PMD_PRIVATE_H_\n #define _DPAA2_SEC_PMD_PRIVATE_H_\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #include <rte_security_driver.h>\n #endif\n \n@@ -141,7 +141,7 @@ struct dpaa2_sec_aead_ctxt {\n \tuint8_t auth_cipher_text;       /**< Authenticate/cipher ordering */\n };\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n /*\n  * The structure is to be filled by user for PDCP Protocol\n  */\n@@ -193,7 +193,7 @@ typedef struct dpaa2_sec_session_entry {\n \t\t\t\tstruct dpaa2_sec_aead_ctxt aead_ctxt;\n \t\t\t} ext_params;\n \t\t};\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\tstruct dpaa2_pdcp_ctxt pdcp;\n #endif\n \t};\n@@ -550,7 +550,7 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {\n \tRTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()\n };\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \n static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = {\n \t{\t/* SNOW 3G (UIA2) */\ndiff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c\nindex 97002170b0..c4d1747a77 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c\n@@ -15,7 +15,7 @@\n #include <rte_cryptodev_pmd.h>\n #include <rte_crypto.h>\n #include <rte_cryptodev.h>\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #include <rte_security_driver.h>\n #endif\n #include <rte_cycles.h>\n@@ -229,7 +229,7 @@ static inline int is_decode(dpaa_sec_session *ses)\n \treturn ses->dir == DIR_DEC;\n }\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static int\n dpaa_sec_prep_pdcp_cdb(dpaa_sec_session *ses)\n {\n@@ -408,7 +408,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\n \tmemset(cdb, 0, sizeof(struct sec_cdb));\n \n \tswitch (ses->ctxt) {\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tcase DPAA_SEC_IPSEC:\n \t\tshared_desc_len = dpaa_sec_prep_ipsec_cdb(ses);\n \t\tbreak;\n@@ -1539,7 +1539,7 @@ build_cipher_auth(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \treturn cf;\n }\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static inline struct dpaa_sec_job *\n build_proto(struct rte_crypto_op *op, dpaa_sec_session *ses)\n {\n@@ -1714,7 +1714,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\t\t\t\t\top->sym->session,\n \t\t\t\t\t\t\tcryptodev_driver_id);\n \t\t\t\tbreak;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\t\tcase RTE_CRYPTO_OP_SECURITY_SESSION:\n \t\t\t\tses = (dpaa_sec_session *)\n \t\t\t\t\tget_sec_session_private_data(\n@@ -1761,7 +1761,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\t\t  ((op->sym->m_dst == NULL) ||\n \t\t\t\t   rte_pktmbuf_is_contiguous(op->sym->m_dst))) {\n \t\t\t\tswitch (ses->ctxt) {\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\t\t\tcase DPAA_SEC_PDCP:\n \t\t\t\tcase DPAA_SEC_IPSEC:\n \t\t\t\t\tcf = build_proto(op, ses);\n@@ -1795,7 +1795,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\t\t}\n \t\t\t} else {\n \t\t\t\tswitch (ses->ctxt) {\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\t\t\tcase DPAA_SEC_PDCP:\n \t\t\t\tcase DPAA_SEC_IPSEC:\n \t\t\t\t\tcf = build_proto_sg(op, ses);\n@@ -1852,7 +1852,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\t\t\t((auth_tail_len << 16) | auth_hdr_len);\n \t\t\t}\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\t\t/* In case of PDCP, per packet HFN is stored in\n \t\t\t * mbuf priv after sym_op.\n \t\t\t */\n@@ -2467,7 +2467,7 @@ dpaa_sec_sym_session_clear(struct rte_cryptodev *dev,\n \t}\n }\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static int\n dpaa_sec_ipsec_aead_init(struct rte_crypto_aead_xform *aead_xform,\n \t\t\tstruct rte_security_ipsec_xform *ipsec_xform,\n@@ -3271,7 +3271,7 @@ static struct rte_cryptodev_ops crypto_ops = {\n \t.sym_session_clear        = dpaa_sec_sym_session_clear\n };\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static const struct rte_security_capability *\n dpaa_sec_capabilities_get(void *device __rte_unused)\n {\n@@ -3310,7 +3310,7 @@ static int\n dpaa_sec_dev_init(struct rte_cryptodev *cryptodev)\n {\n \tstruct dpaa_sec_dev_private *internals;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tstruct rte_security_ctx *security_instance;\n #endif\n \tstruct dpaa_sec_qp *qp;\n@@ -3347,7 +3347,7 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev)\n \t\tDPAA_SEC_WARN(\"Device already init by primary process\");\n \t\treturn 0;\n \t}\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t/* Initialize security_ctx only for primary process*/\n \tsecurity_instance = rte_malloc(\"rte_security_instances_ops\",\n \t\t\t\tsizeof(struct rte_security_ctx), 0);\ndiff --git a/drivers/crypto/dpaa_sec/dpaa_sec.h b/drivers/crypto/dpaa_sec/dpaa_sec.h\nindex 2cd50cc8dd..45ae534990 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.h\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.h\n@@ -98,7 +98,7 @@ struct sec_cdb {\n \n \tuint32_t sh_desc[DPAA_SEC_MAX_DESC_SIZE];\n };\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n /*!\n  * The structure is to be filled by user as a part of\n  * dpaa_sec_proto_ctxt for PDCP Protocol\n@@ -125,7 +125,7 @@ typedef struct dpaa_sec_session_entry {\n \tenum rte_crypto_cipher_algorithm cipher_alg; /*!< Cipher Algorithm*/\n \tenum rte_crypto_auth_algorithm auth_alg; /*!< Authentication Algorithm*/\n \tenum rte_crypto_aead_algorithm aead_alg; /*!< AEAD Algorithm*/\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tenum rte_security_session_protocol proto_alg; /*!< Security Algorithm*/\n #endif\n \tunion {\n@@ -168,7 +168,7 @@ typedef struct dpaa_sec_session_entry {\n \t\t\tuint8_t auth_cipher_text;\n \t\t\t\t/**< Authenticate/cipher ordering */\n \t\t};\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\tstruct sec_pdcp_ctxt pdcp;\n #endif\n \t};\n@@ -568,7 +568,7 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {\n \tRTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()\n };\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = {\n \t{\t/* SNOW 3G (UIA2) */\n \t\t.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,\ndiff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c\nindex e3f98a76ba..4b7676deb8 100644\n--- a/drivers/crypto/qat/qat_sym.c\n+++ b/drivers/crypto/qat/qat_sym.c\n@@ -180,7 +180,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,\n \t} else if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {\n \t\tctx = (struct qat_sym_session *)get_sym_session_private_data(\n \t\t\t\top->sym->session, qat_sym_driver_id);\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t} else {\n \t\tctx = (struct qat_sym_session *)get_sec_session_private_data(\n \t\t\t\top->sym->sec_session);\ndiff --git a/drivers/crypto/qat/qat_sym.h b/drivers/crypto/qat/qat_sym.h\nindex 1a9748849e..da67a56b30 100644\n--- a/drivers/crypto/qat/qat_sym.h\n+++ b/drivers/crypto/qat/qat_sym.h\n@@ -6,7 +6,7 @@\n #define _QAT_SYM_H_\n \n #include <rte_cryptodev_pmd.h>\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #include <rte_net_crc.h>\n #endif\n \n@@ -135,7 +135,7 @@ qat_bpicipher_postprocess(struct qat_sym_session *ctx,\n \treturn sym_op->cipher.data.length - last_block_len;\n }\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static inline void\n qat_crc_verify(struct qat_sym_session *ctx, struct rte_crypto_op *op)\n {\n@@ -231,7 +231,7 @@ qat_sym_process_response(void **op, uint8_t *resp)\n \n \t\trx_op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;\n \t} else {\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\tuint8_t is_docsis_sec = 0;\n \n \t\tif (rx_op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) {\n@@ -256,7 +256,7 @@ qat_sym_process_response(void **op, uint8_t *resp)\n \n \t\tif (sess->bpi_ctx) {\n \t\t\tqat_bpicipher_postprocess(sess, rx_op);\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\t\tif (is_docsis_sec)\n \t\t\t\tqat_crc_verify(sess, rx_op);\n #endif\ndiff --git a/drivers/crypto/qat/qat_sym_capabilities.h b/drivers/crypto/qat/qat_sym_capabilities.h\nindex 4ee798992d..f7cab2f471 100644\n--- a/drivers/crypto/qat/qat_sym_capabilities.h\n+++ b/drivers/crypto/qat/qat_sym_capabilities.h\n@@ -731,7 +731,7 @@\n \t\t}, }\t\t\t\t\t\t\t\\\n \t}\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #define QAT_SECURITY_SYM_CAPABILITIES\t\t\t\t\t\\\n \t{\t/* AES DOCSIS BPI */\t\t\t\t\t\\\n \t\t.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,\t\t\t\\\ndiff --git a/drivers/crypto/qat/qat_sym_pmd.c b/drivers/crypto/qat/qat_sym_pmd.c\nindex 314742f534..a291004cf5 100644\n--- a/drivers/crypto/qat/qat_sym_pmd.c\n+++ b/drivers/crypto/qat/qat_sym_pmd.c\n@@ -8,7 +8,7 @@\n #include <rte_malloc.h>\n #include <rte_pci.h>\n #include <rte_cryptodev_pmd.h>\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #include <rte_security_driver.h>\n #endif\n \n@@ -39,7 +39,7 @@ static const struct rte_cryptodev_capabilities qat_gen3_sym_capabilities[] = {\n \tRTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()\n };\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static const struct rte_cryptodev_capabilities\n \t\t\t\t\tqat_security_sym_capabilities[] = {\n \tQAT_SECURITY_SYM_CAPABILITIES,\n@@ -261,7 +261,7 @@ static struct rte_cryptodev_ops crypto_qat_ops = {\n \t\t.sym_session_clear\t= qat_sym_session_clear\n };\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static const struct rte_security_capability *\n qat_security_cap_get(void *device __rte_unused)\n {\n@@ -385,7 +385,7 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev,\n \t\t\t\"QAT_SYM_CAPA_GEN_%d\",\n \t\t\tqat_pci_dev->qat_dev_gen);\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tstruct rte_security_ctx *security_instance;\n \tsecurity_instance = rte_malloc(\"qat_sec\",\n \t\t\t\tsizeof(struct rte_security_ctx),\n@@ -462,7 +462,7 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev,\n \treturn 0;\n \n error:\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \trte_free(cryptodev->security_ctx);\n \tcryptodev->security_ctx = NULL;\n #endif\n@@ -487,7 +487,7 @@ qat_sym_dev_destroy(struct qat_pci_device *qat_pci_dev)\n \n \t/* free crypto device */\n \tcryptodev = rte_cryptodev_pmd_get_dev(qat_pci_dev->sym_dev->sym_dev_id);\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \trte_free(cryptodev->security_ctx);\n \tcryptodev->security_ctx = NULL;\n #endif\ndiff --git a/drivers/crypto/qat/qat_sym_pmd.h b/drivers/crypto/qat/qat_sym_pmd.h\nindex f32a77e608..e0992cbe27 100644\n--- a/drivers/crypto/qat/qat_sym_pmd.h\n+++ b/drivers/crypto/qat/qat_sym_pmd.h\n@@ -9,7 +9,7 @@\n \n #include <rte_ether.h>\n #include <rte_cryptodev.h>\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #include <rte_security.h>\n #endif\n \ndiff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c\nindex ed4d001592..23d059bf84 100644\n--- a/drivers/crypto/qat/qat_sym_session.c\n+++ b/drivers/crypto/qat/qat_sym_session.c\n@@ -14,7 +14,7 @@\n #include <rte_log.h>\n #include <rte_malloc.h>\n #include <rte_crypto_sym.h>\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #include <rte_security.h>\n #endif\n \n@@ -2109,7 +2109,7 @@ int qat_sym_validate_zuc_key(int key_len, enum icp_qat_hw_cipher_algo *alg)\n \treturn 0;\n }\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static int\n qat_sec_session_check_docsis(struct rte_security_session_conf *conf)\n {\ndiff --git a/drivers/crypto/qat/qat_sym_session.h b/drivers/crypto/qat/qat_sym_session.h\nindex 9f1033baf6..011e5bb7ab 100644\n--- a/drivers/crypto/qat/qat_sym_session.h\n+++ b/drivers/crypto/qat/qat_sym_session.h\n@@ -6,7 +6,7 @@\n \n #include <rte_crypto.h>\n #include <rte_cryptodev_pmd.h>\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #include <rte_security.h>\n #endif\n \n@@ -159,7 +159,7 @@ qat_cipher_get_block_size(enum icp_qat_hw_cipher_algo qat_cipher_alg);\n int\n qat_sym_validate_zuc_key(int key_len, enum icp_qat_hw_cipher_algo *alg);\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n int\n qat_security_session_create(void *dev, struct rte_security_session_conf *conf,\n \t\tstruct rte_security_session *sess, struct rte_mempool *mempool);\ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex 0b98e210e7..7cdb4dfe6a 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -33,7 +33,7 @@\n #include <rte_random.h>\n #include <rte_dev.h>\n #include <rte_hash_crc.h>\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #include <rte_security_driver.h>\n #endif\n \n@@ -1151,7 +1151,7 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)\n \t/* Unlock any pending hardware semaphore */\n \tixgbe_swfw_lock_reset(hw);\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t/* Initialize security_ctx only for primary process*/\n \tif (ixgbe_ipsec_ctx_create(eth_dev))\n \t\treturn -ENOMEM;\n@@ -3053,7 +3053,7 @@ ixgbe_dev_close(struct rte_eth_dev *dev)\n \t/* Remove all Traffic Manager configuration */\n \tixgbe_tm_conf_uninit(dev);\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \trte_free(dev->security_ctx);\n #endif\n \ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h\nindex 9bdef87fbd..33905f7136 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.h\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.h\n@@ -12,7 +12,7 @@\n #include \"base/ixgbe_dcb_82599.h\"\n #include \"base/ixgbe_dcb_82598.h\"\n #include \"ixgbe_bypass.h\"\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n #include \"ixgbe_ipsec.h\"\n #endif\n #include <rte_flow.h>\n@@ -494,7 +494,7 @@ struct ixgbe_adapter {\n \tstruct ixgbe_filter_info    filter;\n \tstruct ixgbe_l2_tn_info     l2_tn;\n \tstruct ixgbe_bw_conf        bw_conf;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tstruct ixgbe_ipsec          ipsec;\n #endif\n \tbool rx_bulk_alloc_allowed;\ndiff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c\nindex b2a2bfc02f..6b3dea46ee 100644\n--- a/drivers/net/ixgbe/ixgbe_flow.c\n+++ b/drivers/net/ixgbe/ixgbe_flow.c\n@@ -215,7 +215,7 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr,\n \tmemset(&eth_null, 0, sizeof(struct rte_flow_item_eth));\n \tmemset(&vlan_null, 0, sizeof(struct rte_flow_item_vlan));\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t/**\n \t *  Special case for flow action type RTE_FLOW_ACTION_TYPE_SECURITY\n \t */\n@@ -629,7 +629,7 @@ ixgbe_parse_ntuple_filter(struct rte_eth_dev *dev,\n \tif (ret)\n \t\treturn ret;\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t/* ESP flow not really a flow*/\n \tif (filter->proto == IPPROTO_ESP)\n \t\treturn 0;\n@@ -3057,7 +3057,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev,\n \tret = ixgbe_parse_ntuple_filter(dev, attr, pattern,\n \t\t\tactions, &ntuple_filter, error);\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t/* ESP flow not really a flow*/\n \tif (ntuple_filter.proto == IPPROTO_ESP)\n \t\treturn flow;\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c\nindex 977ecf5137..a456a4697b 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx.c\n+++ b/drivers/net/ixgbe/ixgbe_rxtx.c\n@@ -452,7 +452,7 @@ ixgbe_set_xmit_ctx(struct ixgbe_tx_queue *txq,\n \t\tseqnum_seed |= tx_offload.l2_len\n \t\t\t       << IXGBE_ADVTXD_TUNNEL_LEN;\n \t}\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tif (ol_flags & PKT_TX_SEC_OFFLOAD) {\n \t\tunion ixgbe_crypto_tx_desc_md *md =\n \t\t\t\t(union ixgbe_crypto_tx_desc_md *)mdata;\n@@ -645,7 +645,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \tuint32_t ctx = 0;\n \tuint32_t new_ctx;\n \tunion ixgbe_tx_offload tx_offload;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tuint8_t use_ipsec;\n #endif\n \n@@ -675,7 +675,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t * are needed for offload functionality.\n \t\t */\n \t\tol_flags = tx_pkt->ol_flags;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\tuse_ipsec = txq->using_ipsec && (ol_flags & PKT_TX_SEC_OFFLOAD);\n #endif\n \n@@ -689,7 +689,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t\ttx_offload.tso_segsz = tx_pkt->tso_segsz;\n \t\t\ttx_offload.outer_l2_len = tx_pkt->outer_l2_len;\n \t\t\ttx_offload.outer_l3_len = tx_pkt->outer_l3_len;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\t\tif (use_ipsec) {\n \t\t\t\tunion ixgbe_crypto_tx_desc_md *ipsec_mdata =\n \t\t\t\t\t(union ixgbe_crypto_tx_desc_md *)\n@@ -876,7 +876,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t}\n \n \t\tolinfo_status |= (pkt_len << IXGBE_ADVTXD_PAYLEN_SHIFT);\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\tif (use_ipsec)\n \t\t\tolinfo_status |= IXGBE_ADVTXD_POPTS_IPSEC;\n #endif\n@@ -1460,7 +1460,7 @@ rx_desc_error_to_pkt_flags(uint32_t rx_status)\n \t\tpkt_flags |= PKT_RX_EIP_CKSUM_BAD;\n \t}\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tif (rx_status & IXGBE_RXD_STAT_SECP) {\n \t\tpkt_flags |= PKT_RX_SEC_OFFLOAD;\n \t\tif (rx_status & IXGBE_RXDADV_LNKSEC_ERROR_BAD_SIG)\n@@ -2399,7 +2399,7 @@ ixgbe_dev_tx_done_cleanup(void *tx_queue, uint32_t free_cnt)\n {\n \tstruct ixgbe_tx_queue *txq = (struct ixgbe_tx_queue *)tx_queue;\n \tif (txq->offloads == 0 &&\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\t\t!(txq->using_ipsec) &&\n #endif\n \t\t\ttxq->tx_rs_thresh >= RTE_PMD_IXGBE_TX_MAX_BURST) {\n@@ -2495,7 +2495,7 @@ ixgbe_set_tx_function(struct rte_eth_dev *dev, struct ixgbe_tx_queue *txq)\n {\n \t/* Use a simple Tx queue (no offloads, no multi segs) if possible */\n \tif ((txq->offloads == 0) &&\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\t\t!(txq->using_ipsec) &&\n #endif\n \t\t\t(txq->tx_rs_thresh >= RTE_PMD_IXGBE_TX_MAX_BURST)) {\n@@ -2554,7 +2554,7 @@ ixgbe_get_tx_port_offloads(struct rte_eth_dev *dev)\n \t    hw->mac.type == ixgbe_mac_X550EM_a)\n \t\ttx_offload_capa |= DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tif (dev->security_ctx)\n \t\ttx_offload_capa |= DEV_TX_OFFLOAD_SECURITY;\n #endif\n@@ -2722,7 +2722,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \ttxq->offloads = offloads;\n \ttxq->ops = &def_txq_ops;\n \ttxq->tx_deferred_start = tx_conf->tx_deferred_start;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \ttxq->using_ipsec = !!(dev->data->dev_conf.txmode.offloads &\n \t\t\tDEV_TX_OFFLOAD_SECURITY);\n #endif\n@@ -3005,7 +3005,7 @@ ixgbe_get_rx_port_offloads(struct rte_eth_dev *dev)\n \t    hw->mac.type == ixgbe_mac_X550EM_a)\n \t\toffloads |= DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM;\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tif (dev->security_ctx)\n \t\toffloads |= DEV_RX_OFFLOAD_SECURITY;\n #endif\n@@ -4834,7 +4834,7 @@ ixgbe_set_rx_function(struct rte_eth_dev *dev)\n \t\tstruct ixgbe_rx_queue *rxq = dev->data->rx_queues[i];\n \n \t\trxq->rx_using_sse = rx_using_sse;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\trxq->using_ipsec = !!(dev->data->dev_conf.rxmode.offloads &\n \t\t\t\tDEV_RX_OFFLOAD_SECURITY);\n #endif\n@@ -5346,7 +5346,7 @@ ixgbe_dev_rxtx_start(struct rte_eth_dev *dev)\n \t\t\tixgbe_setup_loopback_link_x540_x550(hw, true);\n \t}\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tif ((dev->data->dev_conf.rxmode.offloads &\n \t\t\tDEV_RX_OFFLOAD_SECURITY) ||\n \t\t(dev->data->dev_conf.txmode.offloads &\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx.h b/drivers/net/ixgbe/ixgbe_rxtx.h\nindex 7e09291b22..fa15911121 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx.h\n+++ b/drivers/net/ixgbe/ixgbe_rxtx.h\n@@ -113,7 +113,7 @@ struct ixgbe_rx_queue {\n \tuint16_t rx_free_trigger; /**< triggers rx buffer allocation */\n \tuint8_t            rx_using_sse;\n \t/**< indicates that vector RX is in use */\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tuint8_t            using_ipsec;\n \t/**< indicates that IPsec RX feature is in use */\n #endif\n@@ -161,7 +161,7 @@ union ixgbe_tx_offload {\n \t\t/* fields for TX offloading of tunnels */\n \t\tuint64_t outer_l3_len:8; /**< Outer L3 (IP) Hdr Length. */\n \t\tuint64_t outer_l2_len:8; /**< Outer L2 (MAC) Hdr Length. */\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\t/* inline ipsec related*/\n \t\tuint64_t sa_idx:8;\t/**< TX SA database entry index */\n \t\tuint64_t sec_pad_len:4;\t/**< padding length */\n@@ -230,7 +230,7 @@ struct ixgbe_tx_queue {\n \tstruct ixgbe_advctx_info ctx_cache[IXGBE_CTX_NUM];\n \tconst struct ixgbe_txq_ops *ops;       /**< txq ops */\n \tuint8_t             tx_deferred_start; /**< not in global dev start. */\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tuint8_t\t\t    using_ipsec;\n \t/**< indicates that IPsec TX feature is in use */\n #endif\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c\nindex 517ca31669..e7ccb72a72 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c\n+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c\n@@ -93,7 +93,7 @@ ixgbe_rxq_rearm(struct ixgbe_rx_queue *rxq)\n \tIXGBE_PCI_REG_WRITE(rxq->rdt_reg_addr, rx_id);\n }\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n static inline void\n desc_to_olflags_v_ipsec(__m128i descs[4], struct rte_mbuf **rx_pkts)\n {\n@@ -318,7 +318,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,\n \tvolatile union ixgbe_adv_rx_desc *rxdp;\n \tstruct ixgbe_rx_entry *sw_ring;\n \tuint16_t nb_pkts_recd;\n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \tuint8_t use_ipsec = rxq->using_ipsec;\n #endif\n \tint pos;\n@@ -484,7 +484,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,\n \t\t/* set ol_flags with vlan packet type */\n \t\tdesc_to_olflags_v(descs, mbuf_init, vlan_flags, &rx_pkts[pos]);\n \n-#ifdef RTE_LIBRTE_SECURITY\n+#ifdef RTE_LIB_SECURITY\n \t\tif (unlikely(use_ipsec))\n \t\t\tdesc_to_olflags_v_ipsec(descs, &rx_pkts[pos]);\n #endif\ndiff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build\nindex 0539b4768a..d9fa898d1a 100644\n--- a/drivers/net/kni/meson.build\n+++ b/drivers/net/kni/meson.build\n@@ -2,7 +2,7 @@\n # Copyright(c) 2018 Intel Corporation\n \n # this driver can be built if-and-only-if KNI library is buildable\n-build = dpdk_conf.has('RTE_LIBRTE_KNI')\n+build = dpdk_conf.has('RTE_LIB_KNI')\n reason = 'missing dependency, DPDK KNI library'\n sources = files('rte_eth_kni.c')\n deps += 'kni'\ndiff --git a/drivers/net/netvsc/meson.build b/drivers/net/netvsc/meson.build\nindex e7f4493028..f3f52f7327 100644\n--- a/drivers/net/netvsc/meson.build\n+++ b/drivers/net/netvsc/meson.build\n@@ -1,7 +1,7 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2018 Microsoft Corporation\n \n-build = dpdk_conf.has('RTE_LIBRTE_VMBUS_BUS')\n+build = dpdk_conf.has('RTE_BUS_VMBUS')\n reason = 'missing dependency, DPDK VMBus driver'\n sources = files('hn_ethdev.c', 'hn_rxtx.c', 'hn_rndis.c', 'hn_nvs.c', 'hn_vf.c')\n \ndiff --git a/drivers/net/vhost/meson.build b/drivers/net/vhost/meson.build\nindex d7930862a7..963b30f209 100644\n--- a/drivers/net/vhost/meson.build\n+++ b/drivers/net/vhost/meson.build\n@@ -1,7 +1,7 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2018 Intel Corporation\n \n-build = dpdk_conf.has('RTE_LIBRTE_VHOST')\n+build = dpdk_conf.has('RTE_LIB_VHOST')\n reason = 'missing dependency, DPDK vhost library'\n sources = files('rte_eth_vhost.c')\n install_headers('rte_eth_vhost.h')\ndiff --git a/drivers/raw/dpaa2_cmdif/meson.build b/drivers/raw/dpaa2_cmdif/meson.build\nindex e7656a3cda..06c0fe756d 100644\n--- a/drivers/raw/dpaa2_cmdif/meson.build\n+++ b/drivers/raw/dpaa2_cmdif/meson.build\n@@ -1,7 +1,7 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright 2018 NXP\n \n-build = dpdk_conf.has('RTE_LIBRTE_DPAA2_MEMPOOL')\n+build = dpdk_conf.has('RTE_MEMPOOL_DPAA2')\n reason = 'missing dependency, DPDK DPAA2 mempool driver'\n deps += ['rawdev', 'mempool_dpaa2', 'bus_vdev']\n sources = files('dpaa2_cmdif.c')\ndiff --git a/drivers/raw/dpaa2_qdma/meson.build b/drivers/raw/dpaa2_qdma/meson.build\nindex b9b08153ac..3eeab0d1c1 100644\n--- a/drivers/raw/dpaa2_qdma/meson.build\n+++ b/drivers/raw/dpaa2_qdma/meson.build\n@@ -1,7 +1,7 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright 2018 NXP\n \n-build = dpdk_conf.has('RTE_LIBRTE_DPAA2_MEMPOOL')\n+build = dpdk_conf.has('RTE_MEMPOOL_DPAA2')\n reason = 'missing dependency, DPDK DPAA2 mempool driver'\n deps += ['rawdev', 'mempool_dpaa2', 'ring', 'kvargs']\n sources = files('dpaa2_qdma.c')\ndiff --git a/drivers/raw/ifpga/base/opae_osdep.h b/drivers/raw/ifpga/base/opae_osdep.h\nindex 416cef01cb..18e6a11aac 100644\n--- a/drivers/raw/ifpga/base/opae_osdep.h\n+++ b/drivers/raw/ifpga/base/opae_osdep.h\n@@ -8,7 +8,7 @@\n #include <string.h>\n #include <stdbool.h>\n \n-#ifdef RTE_LIBRTE_EAL\n+#ifdef RTE_LIB_EAL\n #include \"osdep_rte/osdep_generic.h\"\n #else\n #include \"osdep_raw/osdep_generic.h\"\ndiff --git a/drivers/vdpa/ifc/meson.build b/drivers/vdpa/ifc/meson.build\nindex b179987f98..9d256af4b9 100644\n--- a/drivers/vdpa/ifc/meson.build\n+++ b/drivers/vdpa/ifc/meson.build\n@@ -1,7 +1,7 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2018 Intel Corporation\n \n-build = dpdk_conf.has('RTE_LIBRTE_VHOST')\n+build = dpdk_conf.has('RTE_LIB_VHOST')\n reason = 'missing dependency, DPDK vhost library'\n sources = files('ifcvf_vdpa.c', 'base/ifcvf.c')\n includes += include_directories('base')\ndiff --git a/examples/distributor/meson.build b/examples/distributor/meson.build\nindex 9fec7f883f..5244cd4ffc 100644\n--- a/examples/distributor/meson.build\n+++ b/examples/distributor/meson.build\n@@ -7,7 +7,7 @@\n # DPDK instance, use 'make'\n \n # require the power library\n-build = dpdk_conf.has('RTE_LIBRTE_POWER')\n+build = dpdk_conf.has('RTE_LIB_POWER')\n \n allow_experimental_apis = true\n deps += ['distributor', 'power']\ndiff --git a/examples/ethtool/lib/rte_ethtool.c b/examples/ethtool/lib/rte_ethtool.c\nindex db8150efd5..13f9ba3795 100644\n--- a/examples/ethtool/lib/rte_ethtool.c\n+++ b/examples/ethtool/lib/rte_ethtool.c\n@@ -9,7 +9,7 @@\n #include <rte_ethdev.h>\n #include <rte_ether.h>\n #include <rte_bus_pci.h>\n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n #include <rte_pmd_ixgbe.h>\n #endif\n #include \"rte_ethtool.h\"\n@@ -395,7 +395,7 @@ rte_ethtool_net_set_rx_mode(uint16_t port_id)\n \n \t/* Set VF vf_rx_mode, VF unsupport status is discard */\n \tfor (vf = 0; vf < num_vfs; vf++) {\n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \t\trte_pmd_ixgbe_set_vf_rxmode(port_id, vf,\n \t\t\tETH_VMDQ_ACCEPT_UNTAG, 0);\n #endif\ndiff --git a/examples/ethtool/meson.build b/examples/ethtool/meson.build\nindex fdfdd1971e..cc8edac3df 100644\n--- a/examples/ethtool/meson.build\n+++ b/examples/ethtool/meson.build\n@@ -13,7 +13,7 @@ sources = files('lib/rte_ethtool.c',\n includes = include_directories('lib', 'ethtool-app')\n \n deps += 'bus_pci'\n-if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD')\n+if dpdk_conf.has('RTE_NET_IXGBE')\n \tdeps += 'net_ixgbe'\n endif\n \ndiff --git a/examples/ioat/meson.build b/examples/ioat/meson.build\nindex f1a045a0a6..6afbaa6803 100644\n--- a/examples/ioat/meson.build\n+++ b/examples/ioat/meson.build\n@@ -7,7 +7,7 @@\n # DPDK instance, use 'make'\n \n allow_experimental_apis = true\n-build = dpdk_conf.has('RTE_LIBRTE_PMD_IOAT_RAWDEV')\n+build = dpdk_conf.has('RTE_RAW_IOAT')\n \n deps += ['raw_ioat']\n \ndiff --git a/examples/ip_pipeline/kni.c b/examples/ip_pipeline/kni.c\nindex 4519685932..a2d3331cb0 100644\n--- a/examples/ip_pipeline/kni.c\n+++ b/examples/ip_pipeline/kni.c\n@@ -24,7 +24,7 @@ kni_init(void)\n {\n \tTAILQ_INIT(&kni_list);\n \n-#ifdef RTE_LIBRTE_KNI\n+#ifdef RTE_LIB_KNI\n \trte_kni_init(KNI_MAX);\n #endif\n \n@@ -46,7 +46,7 @@ kni_find(const char *name)\n \treturn NULL;\n }\n \n-#ifndef RTE_LIBRTE_KNI\n+#ifndef RTE_LIB_KNI\n \n struct kni *\n kni_create(const char *name __rte_unused,\ndiff --git a/examples/ip_pipeline/kni.h b/examples/ip_pipeline/kni.h\nindex c3856456d6..118f48df73 100644\n--- a/examples/ip_pipeline/kni.h\n+++ b/examples/ip_pipeline/kni.h\n@@ -8,7 +8,7 @@\n #include <stdint.h>\n #include <sys/queue.h>\n \n-#ifdef RTE_LIBRTE_KNI\n+#ifdef RTE_LIB_KNI\n #include <rte_kni.h>\n #endif\n \n@@ -17,7 +17,7 @@\n struct kni {\n \tTAILQ_ENTRY(kni) node;\n \tchar name[NAME_SIZE];\n-#ifdef RTE_LIBRTE_KNI\n+#ifdef RTE_LIB_KNI\n \tstruct rte_kni *k;\n #endif\n };\ndiff --git a/examples/ip_pipeline/pipeline.c b/examples/ip_pipeline/pipeline.c\nindex b627310a0c..7ebabcae98 100644\n--- a/examples/ip_pipeline/pipeline.c\n+++ b/examples/ip_pipeline/pipeline.c\n@@ -11,7 +11,7 @@\n \n #include <rte_string_fns.h>\n #include <rte_port_ethdev.h>\n-#ifdef RTE_LIBRTE_KNI\n+#ifdef RTE_LIB_KNI\n #include <rte_port_kni.h>\n #endif\n #include <rte_port_ring.h>\n@@ -28,7 +28,7 @@\n #include <rte_table_lpm_ipv6.h>\n #include <rte_table_stub.h>\n \n-#ifdef RTE_LIBRTE_KNI\n+#ifdef RTE_LIB_KNI\n #include \"kni.h\"\n #endif\n #include \"link.h\"\n@@ -160,7 +160,7 @@ pipeline_port_in_create(const char *pipeline_name,\n \t\tstruct rte_port_ring_reader_params ring;\n \t\tstruct rte_port_sched_reader_params sched;\n \t\tstruct rte_port_fd_reader_params fd;\n-#ifdef RTE_LIBRTE_KNI\n+#ifdef RTE_LIB_KNI\n \t\tstruct rte_port_kni_reader_params kni;\n #endif\n \t\tstruct rte_port_source_params source;\n@@ -264,7 +264,7 @@ pipeline_port_in_create(const char *pipeline_name,\n \t\tbreak;\n \t}\n \n-#ifdef RTE_LIBRTE_KNI\n+#ifdef RTE_LIB_KNI\n \tcase PORT_IN_KNI:\n \t{\n \t\tstruct kni *kni;\n@@ -404,7 +404,7 @@ pipeline_port_out_create(const char *pipeline_name,\n \t\tstruct rte_port_ring_writer_params ring;\n \t\tstruct rte_port_sched_writer_params sched;\n \t\tstruct rte_port_fd_writer_params fd;\n-#ifdef RTE_LIBRTE_KNI\n+#ifdef RTE_LIB_KNI\n \t\tstruct rte_port_kni_writer_params kni;\n #endif\n \t\tstruct rte_port_sink_params sink;\n@@ -415,7 +415,7 @@ pipeline_port_out_create(const char *pipeline_name,\n \t\tstruct rte_port_ethdev_writer_nodrop_params ethdev;\n \t\tstruct rte_port_ring_writer_nodrop_params ring;\n \t\tstruct rte_port_fd_writer_nodrop_params fd;\n-#ifdef RTE_LIBRTE_KNI\n+#ifdef RTE_LIB_KNI\n \t\tstruct rte_port_kni_writer_nodrop_params kni;\n #endif\n \t\tstruct rte_port_sym_crypto_writer_nodrop_params sym_crypto;\n@@ -537,7 +537,7 @@ pipeline_port_out_create(const char *pipeline_name,\n \t\tbreak;\n \t}\n \n-#ifdef RTE_LIBRTE_KNI\n+#ifdef RTE_LIB_KNI\n \tcase PORT_OUT_KNI:\n \t{\n \t\tstruct kni *kni;\ndiff --git a/examples/kni/meson.build b/examples/kni/meson.build\nindex fd6ae4442a..58639b1392 100644\n--- a/examples/kni/meson.build\n+++ b/examples/kni/meson.build\n@@ -7,7 +7,7 @@\n # DPDK instance, use 'make'\n \n # this app can be built if-and-only-if KNI library is buildable\n-build = dpdk_conf.has('RTE_LIBRTE_KNI')\n+build = dpdk_conf.has('RTE_LIB_KNI')\n deps += ['kni', 'bus_pci']\n sources = files(\n \t'main.c'\ndiff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c\nindex 820470db50..8ea2677e56 100644\n--- a/examples/l2fwd-crypto/main.c\n+++ b/examples/l2fwd-crypto/main.c\n@@ -43,7 +43,7 @@\n #include <rte_prefetch.h>\n #include <rte_random.h>\n #include <rte_hexdump.h>\n-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER\n+#ifdef RTE_CRYPTO_SCHEDULER\n #include <rte_cryptodev_scheduler.h>\n #endif\n \n@@ -2273,7 +2273,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,\n \t\t * (one for the header, one for the private data)\n \t\t */\n \t\tif (!strcmp(dev_info.driver_name, \"crypto_scheduler\")) {\n-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER\n+#ifdef RTE_CRYPTO_SCHEDULER\n \t\t\tuint32_t nb_slaves =\n \t\t\t\trte_cryptodev_scheduler_slaves_get(cdev_id,\n \t\t\t\t\t\t\t\tNULL);\ndiff --git a/examples/l2fwd-crypto/meson.build b/examples/l2fwd-crypto/meson.build\nindex 9002d62a6c..1813f015b2 100644\n--- a/examples/l2fwd-crypto/meson.build\n+++ b/examples/l2fwd-crypto/meson.build\n@@ -7,7 +7,7 @@\n # DPDK instance, use 'make'\n \n deps += 'cryptodev'\n-if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')\n+if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')\n \tdeps += 'crypto_scheduler'\n endif\n allow_experimental_apis = true\ndiff --git a/examples/l3fwd-power/meson.build b/examples/l3fwd-power/meson.build\nindex 4cd694710d..eb8aef306a 100644\n--- a/examples/l3fwd-power/meson.build\n+++ b/examples/l3fwd-power/meson.build\n@@ -6,7 +6,7 @@\n # To build this example as a standalone application with an already-installed\n # DPDK instance, use 'make'\n \n-if not dpdk_conf.has('RTE_LIBRTE_POWER')\n+if not dpdk_conf.has('RTE_LIB_POWER')\n         build = false\n         subdir_done()\n endif\ndiff --git a/examples/ntb/meson.build b/examples/ntb/meson.build\nindex bac6e5cd23..b0201f68b1 100644\n--- a/examples/ntb/meson.build\n+++ b/examples/ntb/meson.build\n@@ -15,6 +15,6 @@ cflags += ['-D_FILE_OFFSET_BITS=64']\n sources = files(\n \t'ntb_fwd.c'\n )\n-if dpdk_conf.has('RTE_LIBRTE_PMD_NTB_RAWDEV')\n+if dpdk_conf.has('RTE_RAW_NTB')\n \tdeps += 'raw_ntb'\n endif\ndiff --git a/examples/vhost_crypto/meson.build b/examples/vhost_crypto/meson.build\nindex 2485f3bd10..b2c125e2fa 100644\n--- a/examples/vhost_crypto/meson.build\n+++ b/examples/vhost_crypto/meson.build\n@@ -6,7 +6,7 @@\n # To build this example as a standalone application with an already-installed\n # DPDK instance, use 'make'\n \n-build = dpdk_conf.has('RTE_LIBRTE_VHOST')\n+build = dpdk_conf.has('RTE_LIB_VHOST')\n allow_experimental_apis = true\n deps += ['vhost', 'cryptodev']\n sources = files(\ndiff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c\nindex 1d00a6cf6c..228f06803d 100644\n--- a/examples/vm_power_manager/channel_monitor.c\n+++ b/examples/vm_power_manager/channel_monitor.c\n@@ -28,7 +28,7 @@\n #include <rte_atomic.h>\n #include <rte_cycles.h>\n #include <rte_ethdev.h>\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n #include <rte_pmd_i40e.h>\n #endif\n #include <rte_power.h>\n@@ -439,7 +439,7 @@ get_pfid(struct policy *pol)\n \tfor (i = 0; i < pol->pkt.nb_mac_to_monitor; i++) {\n \n \t\tRTE_ETH_FOREACH_DEV(x) {\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \t\t\tret = rte_pmd_i40e_query_vfid_by_mac(x,\n \t\t\t\t(struct rte_ether_addr *)&(pol->pkt.vfid[i]));\n #else\n@@ -538,13 +538,13 @@ get_pkt_diff(struct policy *pol)\n \t\tvsi_pkt_count_prev_total = 0;\n \tdouble rdtsc_curr, rdtsc_diff, diff;\n \tint x;\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \tstruct rte_eth_stats vf_stats;\n #endif\n \n \tfor (x = 0; x < pol->pkt.nb_mac_to_monitor; x++) {\n \n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \t\t/*Read vsi stats*/\n \t\tif (rte_pmd_i40e_get_vf_stats(x, pol->pfid[x], &vf_stats) == 0)\n \t\t\tvsi_pkt_count = vf_stats.ipackets;\ndiff --git a/examples/vm_power_manager/guest_cli/meson.build b/examples/vm_power_manager/guest_cli/meson.build\nindex 8c725420d7..cd95266018 100644\n--- a/examples/vm_power_manager/guest_cli/meson.build\n+++ b/examples/vm_power_manager/guest_cli/meson.build\n@@ -6,7 +6,7 @@\n # To build this example as a standalone application with an already-installed\n # DPDK instance, use 'make'\n \n-if not dpdk_conf.has('RTE_LIBRTE_POWER')\n+if not dpdk_conf.has('RTE_LIB_POWER')\n         build = false\n         subdir_done()\n endif\ndiff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c\nindex 44d2508b10..17b38406fc 100644\n--- a/examples/vm_power_manager/main.c\n+++ b/examples/vm_power_manager/main.c\n@@ -31,13 +31,13 @@\n #include \"vm_power_cli.h\"\n #include \"oob_monitor.h\"\n #include \"parse.h\"\n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n #include <rte_pmd_ixgbe.h>\n #endif\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n #include <rte_pmd_i40e.h>\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n #include <rte_pmd_bnxt.h>\n #endif\n \n@@ -397,16 +397,16 @@ main(int argc, char **argv)\n \t\t\t\teth.addr_bytes[5] = w + 0xf0;\n \n \t\t\t\tret = -ENOTSUP;\n-#ifdef RTE_LIBRTE_IXGBE_PMD\n+#ifdef RTE_NET_IXGBE\n \t\t\t\tret = rte_pmd_ixgbe_set_vf_mac_addr(portid,\n \t\t\t\t\t\t\tw, &eth);\n #endif\n-#ifdef RTE_LIBRTE_I40E_PMD\n+#ifdef RTE_NET_I40E\n \t\t\t\tif (ret == -ENOTSUP)\n \t\t\t\t\tret = rte_pmd_i40e_set_vf_mac_addr(\n \t\t\t\t\t\t\tportid, w, &eth);\n #endif\n-#ifdef RTE_LIBRTE_BNXT_PMD\n+#ifdef RTE_NET_BNXT\n \t\t\t\tif (ret == -ENOTSUP)\n \t\t\t\t\tret = rte_pmd_bnxt_set_vf_mac_addr(\n \t\t\t\t\t\t\tportid, w, &eth);\ndiff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build\nindex 2dd132015f..1f813fbe87 100644\n--- a/examples/vm_power_manager/meson.build\n+++ b/examples/vm_power_manager/meson.build\n@@ -6,22 +6,22 @@\n # To build this example as a standalone application with an already-installed\n # DPDK instance, use 'make'\n \n-if not dpdk_conf.has('RTE_LIBRTE_POWER')\n+if not dpdk_conf.has('RTE_LIB_POWER')\n \tbuild = false\n \tsubdir_done()\n endif\n \n deps += ['power']\n \n-if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD')\n+if dpdk_conf.has('RTE_NET_BNXT')\n \tdeps += ['net_bnxt']\n endif\n \n-if dpdk_conf.has('RTE_LIBRTE_I40E_PMD')\n+if dpdk_conf.has('RTE_NET_I40E')\n \tdeps += ['net_i40e']\n endif\n \n-if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD')\n+if dpdk_conf.has('RTE_NET_IXGBE')\n \tdeps += ['net_ixgbe']\n endif\n \ndiff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c\nindex 9cf0e2ec01..9b579b8200 100644\n--- a/lib/librte_eal/linux/eal.c\n+++ b/lib/librte_eal/linux/eal.c\n@@ -1085,7 +1085,7 @@ rte_eal_init(int argc, char **argv)\n \t\t\t\t */\n \t\t\t\tiova_mode = RTE_IOVA_VA;\n \t\t\t\tRTE_LOG(DEBUG, EAL, \"Physical addresses are unavailable, selecting IOVA as VA mode.\\n\");\n-#if defined(RTE_LIBRTE_KNI) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)\n+#if defined(RTE_LIB_KNI) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)\n \t\t\t} else if (rte_eal_check_module(\"rte_kni\") == 1) {\n \t\t\t\tiova_mode = RTE_IOVA_PA;\n \t\t\t\tRTE_LOG(DEBUG, EAL, \"KNI is loaded, selecting IOVA as PA mode for better KNI performance.\\n\");\n@@ -1102,7 +1102,7 @@ rte_eal_init(int argc, char **argv)\n \t\t\t\tRTE_LOG(DEBUG, EAL, \"IOMMU is not available, selecting IOVA as PA mode.\\n\");\n \t\t\t}\n \t\t}\n-#if defined(RTE_LIBRTE_KNI) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)\n+#if defined(RTE_LIB_KNI) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)\n \t\t/* Workaround for KNI which requires physical address to work\n \t\t * in kernels < 4.10\n \t\t */\ndiff --git a/lib/librte_metrics/rte_metrics_telemetry.c b/lib/librte_metrics/rte_metrics_telemetry.c\nindex 289ebae0bd..b97152aeb0 100644\n--- a/lib/librte_metrics/rte_metrics_telemetry.c\n+++ b/lib/librte_metrics/rte_metrics_telemetry.c\n@@ -6,7 +6,7 @@\n \n #include <rte_ethdev.h>\n #include <rte_string_fns.h>\n-#ifdef RTE_LIBRTE_TELEMETRY\n+#ifdef RTE_LIB_TELEMETRY\n #include <rte_telemetry_legacy.h>\n #endif\n \n@@ -529,7 +529,7 @@ RTE_LOG_REGISTER(metrics_log_level, lib.metrics, ERR);\n \n RTE_INIT(metrics_ctor)\n {\n-#ifdef RTE_LIBRTE_TELEMETRY\n+#ifdef RTE_LIB_TELEMETRY\n \trte_telemetry_legacy_register(\"ports_all_stat_values\", DATA_NOT_REQ,\n \t\t\thandle_ports_all_stats_values);\n \trte_telemetry_legacy_register(\"global_stat_values\", DATA_NOT_REQ,\ndiff --git a/lib/librte_metrics/rte_metrics_telemetry.h b/lib/librte_metrics/rte_metrics_telemetry.h\nindex 6c2391c563..3435a55425 100644\n--- a/lib/librte_metrics/rte_metrics_telemetry.h\n+++ b/lib/librte_metrics/rte_metrics_telemetry.h\n@@ -2,7 +2,7 @@\n  * Copyright(c) 2020 Intel Corporation\n  */\n \n-#ifdef RTE_LIBRTE_TELEMETRY\n+#ifdef RTE_LIB_TELEMETRY\n #include <jansson.h>\n #else\n #define json_t void *\ndiff --git a/lib/librte_port/meson.build b/lib/librte_port/meson.build\nindex 9bbae28b75..609624c290 100644\n--- a/lib/librte_port/meson.build\n+++ b/lib/librte_port/meson.build\n@@ -33,7 +33,7 @@ if dpdk_conf.has('RTE_PORT_PCAP')\n \text_deps += pcap_dep # dependency provided in config/meson.build\n endif\n \n-if dpdk_conf.has('RTE_LIBRTE_KNI')\n+if dpdk_conf.has('RTE_LIB_KNI')\n \tsources += files('rte_port_kni.c')\n \theaders += files('rte_port_kni.h')\n \tdeps += 'kni'\ndiff --git a/lib/meson.build b/lib/meson.build\nindex 38678a7fb5..1d40cb13a9 100644\n--- a/lib/meson.build\n+++ b/lib/meson.build\n@@ -72,7 +72,7 @@ foreach l:libraries\n \text_deps = []\n \tdeps = []\n \t# eal is standard dependency once built\n-\tif dpdk_conf.has('RTE_LIBRTE_EAL')\n+\tif dpdk_conf.has('RTE_LIB_EAL')\n \t\tdeps += ['eal']\n \tendif\n \n",
    "prefixes": [
        "RFC",
        "v2",
        "7/8"
    ]
}