Patch Detail

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

{
    "id": 28319,
    "url": "https://patches.dpdk.org/api/patches/28319/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/85260e82d98ff0753c2c44698de4336c27efcda4.1504508375.git.shahafs@mellanox.com/",
    "project": {
        "id": 1,
        "url": "https://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": "<85260e82d98ff0753c2c44698de4336c27efcda4.1504508375.git.shahafs@mellanox.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/85260e82d98ff0753c2c44698de4336c27efcda4.1504508375.git.shahafs@mellanox.com",
    "date": "2017-09-04T07:12:15",
    "name": "[dpdk-dev,1/4] ethdev: rename Rx and Tx configuration structs",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "dc72edc72ac0bec0f0982b30a388b7bc6a60ec9d",
    "submitter": {
        "id": 634,
        "url": "https://patches.dpdk.org/api/people/634/?format=api",
        "name": "Shahaf Shuler",
        "email": "shahafs@mellanox.com"
    },
    "delegate": null,
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/85260e82d98ff0753c2c44698de4336c27efcda4.1504508375.git.shahafs@mellanox.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/28319/comments/",
    "check": "warning",
    "checks": "https://patches.dpdk.org/api/patches/28319/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id B4C5C7CF5;\n\tMon,  4 Sep 2017 09:12:31 +0200 (CEST)",
            "from EUR01-HE1-obe.outbound.protection.outlook.com\n\t(mail-he1eur01on0048.outbound.protection.outlook.com [104.47.0.48])\n\tby dpdk.org (Postfix) with ESMTP id A9E3A7CCA\n\tfor <dev@dpdk.org>; Mon,  4 Sep 2017 09:12:28 +0200 (CEST)",
            "from mellanox.com (82.166.227.17) by\n\tHE1PR05MB3148.eurprd05.prod.outlook.com (2603:10a6:7:36::18) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10;\n\tMon, 4 Sep 2017 07:12:25 +0000"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com;\n\ts=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version;\n\tbh=EZqAMiGvVi6xu96CfRpNUl75NC+RgcK4czA37yBXHAo=;\n\tb=IsOTTQpsZeGN9l0l/+QPCoFESrCBbofcmNPHRnQ5hrSls0SJpkc10MTEjdpIFzWFHhzGoNs6de66wb7elfsLV9xLPJYtHH2hbd/qJV1hNcBmOtagexNU7uPvBUeox2p6vQvJqlJLieFwrD/5C7mkzVZ3Vrd8zfI/YwHlAMCpuFM=",
        "Authentication-Results": "spf=none (sender IP is )\n\tsmtp.mailfrom=shahafs@mellanox.com; ",
        "From": "Shahaf Shuler <shahafs@mellanox.com>",
        "To": "thomas@monjalon.net",
        "Cc": "dev@dpdk.org",
        "Date": "Mon,  4 Sep 2017 10:12:15 +0300",
        "Message-Id": "<85260e82d98ff0753c2c44698de4336c27efcda4.1504508375.git.shahafs@mellanox.com>",
        "X-Mailer": "git-send-email 2.12.0",
        "In-Reply-To": "<cover.1504508374.git.shahafs@mellanox.com>",
        "References": "<cover.1504508374.git.shahafs@mellanox.com>",
        "MIME-Version": "1.0",
        "Content-Type": "text/plain",
        "X-Originating-IP": "[82.166.227.17]",
        "X-ClientProxiedBy": "HE1PR07CA0005.eurprd07.prod.outlook.com\n\t(2603:10a6:7:67::15) To HE1PR05MB3148.eurprd05.prod.outlook.com\n\t(2603:10a6:7:36::18)",
        "X-MS-PublicTrafficType": "Email",
        "X-MS-Office365-Filtering-Correlation-Id": "6b6056fc-2a35-4f15-a267-08d4f3644be2",
        "X-MS-Office365-Filtering-HT": "Tenant",
        "X-Microsoft-Antispam": "UriScan:; BCL:0; PCL:0;\n\tRULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(48565401081)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);\n\tSRVR:HE1PR05MB3148; ",
        "X-Microsoft-Exchange-Diagnostics": [
            "1; HE1PR05MB3148;\n\t3:B0Eq2oCAXVSpuq1kuZEMHgPtBiZzkXSoE7I4KNI7czCKgjhMRRqnattkkjbkuvluLhPrQ3d6jPRZv+l/XFPAzqeGHl4MQbKWjM+3HaHrrXeUdGkWZzjWPMY4swehmCD1fpvaj0M+Iq9g2BJRzHpKUAhW/Hv2vqKV6OnXazfEMF1dHjK1AppjfuXTYlfHdnJ48z7Rp5OzVN9vJZQViNg9O84uyBJbnko5MOVOrLW4oB1OmX48xjZUXCCmXAL6eAL9;\n\t25:a4zfN380+QYBB02bmqWq+t0pH4PTxY+IlRzULFVeXoGBM76onT3T3c6D3GdVthfV94+J2UAcpzWYiWeg+ERtqDWml9LInLV0AHsxCYmzPWnkRFVIWPblfj6JMsEc/EWghvYhHwWKLptPIy5YJZ8vndPXPVlidJ4aSE8EgOTzKal4ZPFa8gOChQ7py05pXCVZ63rmhFEP0d/ENvcfGobHzPr5e0YhZhBhA29XOMXeqmgDgcQQL9LPNkX+h+OwoDuw362sNB/q4igk5TzKZzBrVES3ieOo2Soc3KZxvowwR27ZCmQbGyHpejTemS2VFcDo9SQQD5DX7IS5Jwwxu4tVyg==;\n\t31:W7qFvzXqj9JN/DzHBw5PU4bvLqbkcqaywTMm1h4Hcj6pkiQbHv8ghX+lOpUFp91G+vj2rlSDVzcZR5rCvuu7IGb980E7C8123n4ZWHoXVczxjedGeAN9u53vW1Za5xABdHrmD5HFTjjZDosb7IMWVceUJiP+gshom+feVwoPGyWK2liQ+nSoBwDSYP23oYbC7gnyA1Lngz2sfAf7ORo2zewoEUMKbU/uXjWZ8N3JL64=",
            "1; HE1PR05MB3148;\n\t20:40vsBivaSU4nGuNiaxjLOphG+SuRAyNB9IR21C8yxf7tbBRshSHTMEREDRazFRY84jakn/FDmWchjI5LTDQg8ONUBhTgOxh6jVckUwgOGe8OJg1VGI/D5ucUZ+n+1Zdy+CmLOp2RkxJFaxZSuNx0C36vWqZrTfBWWIKHu+kGnYBTPXqXUxOKQm9k+0RMry9aWgRH2BrNYsCCKp5bRNmX8HWxuzBOqr4GNG8MZ1cKSuz+E6PnWuOuHhDw9alvndNKJ+Scb0+5xDhbTWH/AmNpz+YDEVUCUQQQqRaSE1Z7HBi7Kqh80dnx5Au2Dpt4M6c+9A+Sy7pYI12OdF5it3IbhlovEztiFJIkthx59LFk471a7t4gE+cK0BdP6PHaGBzeXjEuj22yfP+PJthV70X07kggYcTgVkTrjb9aZR3jzhSYVqHefJa/lrXOSVSnXKal5j5hFcKgcDCgUOZzwkl7uAShLumPxjIssI2JFT+KxKr+pIc+aBbo84C7dSMY6zEO;\n\t4:FZnc/VwrWx9/4cAD+tTj2uQpNaaVh3VJGNiBmIWxyFiwJXF+uocWZeWJyxx3ym8a7lR29Ouuh9RIYV5H3byKqAvs2gTPaRNaLkodM/9u95Ys5CaChIZxxp6yx+K4RBslw0RoTyCDSWTzjIrOB0tytqHj/YzF4Iyec0GcbbdbfIm8Ve943VbvdJDiqMpzixzVEA1G9zECeB/UFEAZ4LkzO14fGoA4W1coV+PYex7VswfCEWpLy2C48iB77pGnIv60",
            "=?us-ascii?Q?1; HE1PR05MB3148;\n\t23:0KfB9OHuhiqSg2/LO7n4SeI5bkFTsLe3X5uAEyoac?=\n\tKT5vDSrlA4WLB2YH3iHa0w59uhhFOb4iDGuVahFWWVZiK1nvaiRrPNjMfm85zjOdP7dJJXwafjAOGAIPUIcItyyQCtz/hTHekLdkF4Byqwec9ayhPiCs4Pf2+uoCV7WqLWc9mJyVLAarmK+b4Gl1KmzHzuL52ZxENNeFoc57oKuv+jDGIOQgThsZFSeVyUeKqIrKEyB/KRsCSYKQSaxAGm+VQaRXHmGySSlFrW2sSpDrQByJAGMF9dk28Tx63Eeyua3/WobrNi9m61zsMqw3VBIWC5e0sC1LeQ1yWfBWvU7kRZXeBkWmIorVrrU2TFL7Lzi7xbVF3bE/2ikrffqS8ILpLt1+HDUVsFvXAROArhRcMS9MlyP4ufucX6MU7nqf9aElttfEO3x3iFccCf7wpuifYm5/a/Y/WA3MfhiJybTCKox8krKvUK3uufdr3+iTKw0ClqEkbfL8VZgayok2I6BKtzM++VPPfsgjvGUDHCpwC5wWwdYGiBUVzkSv73ApdC0vCvxGssOH5jC/ka6e8H5whmPIeVyiNvWEm6AyEhulsn7dwkiIEj7nNHOJH/cBYTewYgpnKo+Xbq4oOG0Ix/MO+DDHmd14swAMnQM3VG2ILyKzRFcrotMLBM6zMbycjRrp2YMxZuYI9RysFadi4/QhQKQjOzBlS17iseTizyoSQQ1sBkeG/WewzCWiH7Du6mldDSSn28ngRoXGuPdLGOWaR8YxnKBaj+bHIux/1Y8MVY3/406HRFKcpZ0fBYLAqQrGDr28Y1MR+gsvtVXTat3XqoubVmG9LEJNQZk5ZXZyIRqlbxArW3zH368IGbl2I/osmQgj7u3PjeWVN6rhkfJM/MR2c3GG3xqAL4txBQFZhSz6L0o1SVc/1XvznfmeRayIuHKd3v0ArqdzQ3fpPVn6mZQ62cWi83wFP6lFKVb5FjpspZOHNUm2UFttMA18jX2oouHM02lXetV5y9C//bT2TPQsFkeeaYrLlxMFdMWCvUMv/kt5hoHqXybCbbeX613PLa/zjrVrbyX6TYEcw0UGJreQyPVP/bMDFz4vXG0LxoezZvxQeJWm48sMJksZ1VqIBhnCJl/qYFMqvsfTXtteJXNwhXMD/rV8/4k4mjdS8+L1cNTfFSyRbMay7Essb6sqkksLDLk8Zv3ImFpecy2NHs4KhaYGTYj8uYrBq261o8X3EkjuOJblucY/HQWXpWdGzHsgbWb50SeXN00mxATIobDn5HdFmN3m5ANSnP8xabhGiBUJdqvWGw6YscSkZI=",
            "1; HE1PR05MB3148;\n\t6:F2o2u+S6RFGSS2FFscz6dDZfYx3FJx0S8GFwq2oi5KeXj8Wl9ucpW+8Oan2/1aG6KlV+ukFFidkaeXpijpNyTxsAIKC0bWGI0G7tTtX8TjkKpNWJQRf/+BDR7omXS3FRf4g7bi8mmz0TiDdgSXGUOVyqkh8Vl7RNHE7NRNwsy5XXBkvnrhNXb72+apROdAwqxl2hjCu/iYFqhIQR5StBaS0sEHwGyM9J1z6TDGA0gSwM6xufJJ/Y4CHajQVnaomUufdeS6+kepSvk7h+squWBedtPrwa6n15W032yOpvipnUfk/8V5e6aacdVPpZEZl2/RUMg6BDnEFp0gedvUP37g==;\n\t5:g6I2xSg/Awfg39wngwHy0mWr+kcBNPiFOOLwZ79p5Wnd01YgHxXjVIw28cUrchvfu2KrHTM2XJ7s3fkTxuT+yOulJQNde/NIuGaGlV4oITD2M1emvQ19w5q6n5voHC7RNOwMk4oE92hW4hloboTG1g==;\n\t24:yPYgZl+giiHM1XZ/pzRhaA/fogTq33ptAet9ERjADg62Hr27GagR9DJyoqvuumsykD7m2XWlhUCm5RW+J63Z0LX7zrlm0WAtrJKg0LQAHuM=;\n\t7:vNuunh+m5o8rMEE2mAP1xFltjszu5y00CJWQu8hdpgwfl8R+MNfPhEhQLGOdCXde4wALqIawiUiGYL/osrNjKIUF51GSsM1+FKzuH1j1PEWRoen0A+oJO41fCyeu9C3xMsB6h3b74bTax/g2uKAH74cnmV1XuGQ8LvgznqtvN+jy41DIgi+LVEDwWf6DY8xLQwecowVJEybacrJM/DH5rEYus/MIDSQvsWz+qQH8gis="
        ],
        "X-MS-TrafficTypeDiagnostic": "HE1PR05MB3148:",
        "X-LD-Processed": "a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr",
        "X-Exchange-Antispam-Report-Test": "UriScan:;",
        "X-Microsoft-Antispam-PRVS": "<HE1PR05MB31483471859029E0F36EB565C3910@HE1PR05MB3148.eurprd05.prod.outlook.com>",
        "X-Exchange-Antispam-Report-CFA-Test": "BCL:0; PCL:0;\n\tRULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6041248)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);\n\tSRVR:HE1PR05MB3148; BCL:0; PCL:0;\n\tRULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);\n\tSRVR:HE1PR05MB3148; ",
        "X-Forefront-PRVS": "0420213CCD",
        "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(4630300001)(7370300001)(6009001)(39860400002)(189002)(199003)(105586002)(36756003)(69596002)(97736004)(4326008)(305945005)(5003940100001)(2950100002)(7736002)(6916009)(106356001)(50226002)(53936002)(86362001)(575784001)(118296001)(53946003)(5660300001)(68736007)(2361001)(6666003)(16200700003)(110136004)(2351001)(42186005)(55016002)(21086003)(478600001)(33646002)(189998001)(33026002)(3846002)(101416001)(6116002)(2906002)(76176999)(50986999)(48376002)(50466002)(81156014)(81166006)(25786009)(66066001)(47776003)(8676002)(7350300001)(559001)(579004)(569006);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB3148; H:mellanox.com; FPR:;\n\tSPF:None; \n\tPTR:InfoNoRecords; MX:1; A:1; LANG:en; ",
        "Received-SPF": "None (protection.outlook.com: mellanox.com does not designate\n\tpermitted sender hosts)",
        "SpamDiagnosticOutput": "1:99",
        "SpamDiagnosticMetadata": "NSPM",
        "X-OriginatorOrg": "Mellanox.com",
        "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "04 Sep 2017 07:12:25.7286\n\t(UTC)",
        "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted",
        "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "HE1PR05MB3148",
        "Subject": "[dpdk-dev] [PATCH 1/4] ethdev: rename Rx and Tx configuration\n\tstructs",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://dpdk.org/ml/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "Rename the structs rte_eth_txconf and rte_eth_rxconf to\nrte_eth_txq_conf and rte_eth_rxq_conf respectively as those\nstructs represent per queue configuration.\n\nRename was done with the following commands:\n\nfind . \\( -name '*.h' -or -name '*.c' \\) -print0 | xargs -0 sed -i\n's/rte_eth_txconf/rte_eth_txq_conf/g'\n\nfind . \\( -name '*.h' -or -name '*.c' \\) -print0 | xargs -0 sed -i\n's/rte_eth_rxconf/rte_eth_rxq_conf/g'\n\nSigned-off-by: Shahaf Shuler <shahafs@mellanox.com>\n---\n app/test-pmd/config.c                           |  4 +--\n app/test-pmd/testpmd.h                          |  4 +--\n drivers/net/af_packet/rte_eth_af_packet.c       |  4 +--\n drivers/net/ark/ark_ethdev_rx.c                 |  4 +--\n drivers/net/ark/ark_ethdev_rx.h                 |  2 +-\n drivers/net/ark/ark_ethdev_tx.c                 |  2 +-\n drivers/net/ark/ark_ethdev_tx.h                 |  2 +-\n drivers/net/avp/avp_ethdev.c                    |  8 +++---\n drivers/net/bnx2x/bnx2x_rxtx.c                  |  4 +--\n drivers/net/bnx2x/bnx2x_rxtx.h                  |  4 +--\n drivers/net/bnxt/bnxt_ethdev.c                  |  4 +--\n drivers/net/bnxt/bnxt_rxq.c                     |  2 +-\n drivers/net/bnxt/bnxt_rxq.h                     |  2 +-\n drivers/net/bnxt/bnxt_txq.c                     |  2 +-\n drivers/net/bnxt/bnxt_txq.h                     |  2 +-\n drivers/net/bonding/rte_eth_bond_pmd.c          |  7 ++---\n drivers/net/bonding/rte_eth_bond_private.h      |  4 +--\n drivers/net/cxgbe/cxgbe_ethdev.c                |  4 +--\n drivers/net/dpaa2/dpaa2_ethdev.c                |  4 +--\n drivers/net/e1000/e1000_ethdev.h                |  8 +++---\n drivers/net/e1000/em_rxtx.c                     |  4 +--\n drivers/net/e1000/igb_ethdev.c                  |  8 +++---\n drivers/net/e1000/igb_rxtx.c                    |  4 +--\n drivers/net/ena/ena_ethdev.c                    | 28 +++++++++++---------\n drivers/net/enic/enic_ethdev.c                  |  6 ++---\n drivers/net/failsafe/failsafe_ops.c             |  4 +--\n drivers/net/fm10k/fm10k_ethdev.c                | 12 ++++-----\n drivers/net/i40e/i40e_ethdev.c                  |  4 +--\n drivers/net/i40e/i40e_ethdev_vf.c               |  4 +--\n drivers/net/i40e/i40e_rxtx.c                    |  4 +--\n drivers/net/i40e/i40e_rxtx.h                    |  4 +--\n drivers/net/ixgbe/ixgbe_ethdev.c                |  8 +++---\n drivers/net/ixgbe/ixgbe_ethdev.h                |  4 +--\n drivers/net/ixgbe/ixgbe_rxtx.c                  |  4 +--\n drivers/net/kni/rte_eth_kni.c                   |  4 +--\n drivers/net/liquidio/lio_ethdev.c               |  8 +++---\n drivers/net/mlx4/mlx4.c                         | 12 ++++-----\n drivers/net/mlx5/mlx5_rxq.c                     |  4 +--\n drivers/net/mlx5/mlx5_rxtx.h                    |  6 ++---\n drivers/net/mlx5/mlx5_txq.c                     |  4 +--\n drivers/net/nfp/nfp_net.c                       | 12 ++++-----\n drivers/net/null/rte_eth_null.c                 |  4 +--\n drivers/net/pcap/rte_eth_pcap.c                 |  4 +--\n drivers/net/qede/qede_ethdev.c                  |  2 +-\n drivers/net/qede/qede_rxtx.c                    |  4 +--\n drivers/net/qede/qede_rxtx.h                    |  4 +--\n drivers/net/ring/rte_eth_ring.c                 | 20 +++++++-------\n drivers/net/sfc/sfc_ethdev.c                    |  4 +--\n drivers/net/sfc/sfc_rx.c                        |  4 +--\n drivers/net/sfc/sfc_rx.h                        |  2 +-\n drivers/net/sfc/sfc_tx.c                        |  4 +--\n drivers/net/sfc/sfc_tx.h                        |  2 +-\n drivers/net/szedata2/rte_eth_szedata2.c         |  4 +--\n drivers/net/tap/rte_eth_tap.c                   |  4 +--\n drivers/net/thunderx/nicvf_ethdev.c             |  8 +++---\n drivers/net/vhost/rte_eth_vhost.c               |  4 +--\n drivers/net/virtio/virtio_ethdev.c              |  2 +-\n drivers/net/virtio/virtio_ethdev.h              |  4 +--\n drivers/net/virtio/virtio_rxtx.c                |  8 +++---\n drivers/net/vmxnet3/vmxnet3_ethdev.h            |  4 +--\n drivers/net/vmxnet3/vmxnet3_rxtx.c              |  4 +--\n drivers/net/xenvirt/rte_eth_xenvirt.c           | 20 +++++++-------\n examples/ip_fragmentation/main.c                |  2 +-\n examples/ip_pipeline/app.h                      |  4 +--\n examples/ip_reassembly/main.c                   |  2 +-\n examples/ipsec-secgw/ipsec-secgw.c              |  2 +-\n examples/ipv4_multicast/main.c                  |  2 +-\n examples/l3fwd-acl/main.c                       |  2 +-\n examples/l3fwd-power/main.c                     |  2 +-\n examples/l3fwd-vf/main.c                        |  2 +-\n examples/l3fwd/main.c                           |  2 +-\n examples/netmap_compat/lib/compat_netmap.c      |  4 +--\n examples/performance-thread/l3fwd-thread/main.c |  2 +-\n examples/ptpclient/ptpclient.c                  |  2 +-\n examples/qos_sched/init.c                       |  4 +--\n examples/tep_termination/vxlan_setup.c          |  4 +--\n examples/vhost/main.c                           |  4 +--\n examples/vhost_xen/main.c                       |  2 +-\n examples/vmdq/main.c                            |  2 +-\n lib/librte_ether/rte_ethdev.c                   |  4 +--\n lib/librte_ether/rte_ethdev.h                   | 24 +++++++++--------\n test/test-pipeline/init.c                       |  4 +--\n test/test/test_kni.c                            |  4 +--\n test/test/test_link_bonding.c                   |  4 +--\n test/test/test_pmd_perf.c                       |  4 +--\n test/test/virtual_pmd.c                         |  8 +++---\n 86 files changed, 223 insertions(+), 214 deletions(-)",
    "diff": "diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c\nindex 3ae3e1cd8..392f0c57f 100644\n--- a/app/test-pmd/config.c\n+++ b/app/test-pmd/config.c\n@@ -1639,8 +1639,8 @@ rxtx_config_display(void)\n \t\tprintf(\"  packet len=%u - nb packet segments=%d\\n\",\n \t\t\t\t(unsigned)tx_pkt_length, (int) tx_pkt_nb_segs);\n \n-\tstruct rte_eth_rxconf *rx_conf = &ports[0].rx_conf;\n-\tstruct rte_eth_txconf *tx_conf = &ports[0].tx_conf;\n+\tstruct rte_eth_rxq_conf *rx_conf = &ports[0].rx_conf;\n+\tstruct rte_eth_txq_conf *tx_conf = &ports[0].tx_conf;\n \n \tprintf(\"  nb forwarding cores=%d - nb forwarding ports=%d\\n\",\n \t       nb_fwd_lcores, nb_fwd_ports);\ndiff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h\nindex c9d7739b8..507974f43 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -189,8 +189,8 @@ struct rte_port {\n \tuint8_t                 need_reconfig_queues; /**< need reconfiguring queues or not */\n \tuint8_t                 rss_flag;   /**< enable rss or not */\n \tuint8_t                 dcb_flag;   /**< enable dcb */\n-\tstruct rte_eth_rxconf   rx_conf;    /**< rx configuration */\n-\tstruct rte_eth_txconf   tx_conf;    /**< tx configuration */\n+\tstruct rte_eth_rxq_conf   rx_conf;    /**< rx configuration */\n+\tstruct rte_eth_txq_conf   tx_conf;    /**< tx configuration */\n \tstruct ether_addr       *mc_addr_pool; /**< pool of multicast addrs */\n \tuint32_t                mc_addr_nb; /**< nb. of addr. in mc_addr_pool */\n \tuint8_t                 slave_flag; /**< bonding slave port */\ndiff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c\nindex 9a47852ca..7cba0aa91 100644\n--- a/drivers/net/af_packet/rte_eth_af_packet.c\n+++ b/drivers/net/af_packet/rte_eth_af_packet.c\n@@ -395,7 +395,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,\n                    uint16_t rx_queue_id,\n                    uint16_t nb_rx_desc __rte_unused,\n                    unsigned int socket_id __rte_unused,\n-                   const struct rte_eth_rxconf *rx_conf __rte_unused,\n+\t\t   const struct rte_eth_rxq_conf *rx_conf __rte_unused,\n                    struct rte_mempool *mb_pool)\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n@@ -428,7 +428,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev,\n                    uint16_t tx_queue_id,\n                    uint16_t nb_tx_desc __rte_unused,\n                    unsigned int socket_id __rte_unused,\n-                   const struct rte_eth_txconf *tx_conf __rte_unused)\n+\t\t   const struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \n \tstruct pmd_internals *internals = dev->data->dev_private;\ndiff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c\nindex f5d812a55..eb5a2c70a 100644\n--- a/drivers/net/ark/ark_ethdev_rx.c\n+++ b/drivers/net/ark/ark_ethdev_rx.c\n@@ -140,7 +140,7 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t   uint16_t queue_idx,\n \t\t\t   uint16_t nb_desc,\n \t\t\t   unsigned int socket_id,\n-\t\t\t   const struct rte_eth_rxconf *rx_conf,\n+\t\t\t   const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t   struct rte_mempool *mb_pool)\n {\n \tstatic int warning1;\t\t/* = 0 */\n@@ -163,7 +163,7 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \tif (rx_conf != NULL && warning1 == 0) {\n \t\twarning1 = 1;\n \t\tPMD_DRV_LOG(INFO,\n-\t\t\t    \"Arkville ignores rte_eth_rxconf argument.\\n\");\n+\t\t\t    \"Arkville ignores rte_eth_rxq_conf argument.\\n\");\n \t}\n \n \tif (RTE_PKTMBUF_HEADROOM < ARK_RX_META_SIZE) {\ndiff --git a/drivers/net/ark/ark_ethdev_rx.h b/drivers/net/ark/ark_ethdev_rx.h\nindex 3a54a4c91..15b494243 100644\n--- a/drivers/net/ark/ark_ethdev_rx.h\n+++ b/drivers/net/ark/ark_ethdev_rx.h\n@@ -45,7 +45,7 @@ int eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t       uint16_t queue_idx,\n \t\t\t       uint16_t nb_desc,\n \t\t\t       unsigned int socket_id,\n-\t\t\t       const struct rte_eth_rxconf *rx_conf,\n+\t\t\t       const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t       struct rte_mempool *mp);\n uint32_t eth_ark_dev_rx_queue_count(struct rte_eth_dev *dev,\n \t\t\t\t    uint16_t rx_queue_id);\ndiff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c\nindex 0e2d60deb..0e8aaf47a 100644\n--- a/drivers/net/ark/ark_ethdev_tx.c\n+++ b/drivers/net/ark/ark_ethdev_tx.c\n@@ -234,7 +234,7 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t       uint16_t queue_idx,\n \t\t       uint16_t nb_desc,\n \t\t       unsigned int socket_id,\n-\t\t       const struct rte_eth_txconf *tx_conf __rte_unused)\n+\t\t       const struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \tstruct ark_adapter *ark = (struct ark_adapter *)dev->data->dev_private;\n \tstruct ark_tx_queue *queue;\ndiff --git a/drivers/net/ark/ark_ethdev_tx.h b/drivers/net/ark/ark_ethdev_tx.h\nindex 8aaafc22e..eb7ab63ed 100644\n--- a/drivers/net/ark/ark_ethdev_tx.h\n+++ b/drivers/net/ark/ark_ethdev_tx.h\n@@ -49,7 +49,7 @@ int eth_ark_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t   uint16_t queue_idx,\n \t\t\t   uint16_t nb_desc,\n \t\t\t   unsigned int socket_id,\n-\t\t\t   const struct rte_eth_txconf *tx_conf);\n+\t\t\t   const struct rte_eth_txq_conf *tx_conf);\n void eth_ark_tx_queue_release(void *vtx_queue);\n int eth_ark_tx_queue_stop(struct rte_eth_dev *dev, uint16_t queue_id);\n int eth_ark_tx_queue_start(struct rte_eth_dev *dev, uint16_t queue_id);\ndiff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c\nindex c746a0e2c..01bc08a7d 100644\n--- a/drivers/net/avp/avp_ethdev.c\n+++ b/drivers/net/avp/avp_ethdev.c\n@@ -79,14 +79,14 @@ static int avp_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t\t  uint16_t rx_queue_id,\n \t\t\t\t  uint16_t nb_rx_desc,\n \t\t\t\t  unsigned int socket_id,\n-\t\t\t\t  const struct rte_eth_rxconf *rx_conf,\n+\t\t\t\t  const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t\t  struct rte_mempool *pool);\n \n static int avp_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t\t  uint16_t tx_queue_id,\n \t\t\t\t  uint16_t nb_tx_desc,\n \t\t\t\t  unsigned int socket_id,\n-\t\t\t\t  const struct rte_eth_txconf *tx_conf);\n+\t\t\t\t  const struct rte_eth_txq_conf *tx_conf);\n \n static uint16_t avp_recv_scattered_pkts(void *rx_queue,\n \t\t\t\t\tstruct rte_mbuf **rx_pkts,\n@@ -1143,7 +1143,7 @@ avp_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,\n \t\t       uint16_t rx_queue_id,\n \t\t       uint16_t nb_rx_desc,\n \t\t       unsigned int socket_id,\n-\t\t       const struct rte_eth_rxconf *rx_conf,\n+\t\t       const struct rte_eth_rxq_conf *rx_conf,\n \t\t       struct rte_mempool *pool)\n {\n \tstruct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n@@ -1207,7 +1207,7 @@ avp_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,\n \t\t       uint16_t tx_queue_id,\n \t\t       uint16_t nb_tx_desc,\n \t\t       unsigned int socket_id,\n-\t\t       const struct rte_eth_txconf *tx_conf)\n+\t\t       const struct rte_eth_txq_conf *tx_conf)\n {\n \tstruct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n \tstruct avp_queue *txq;\ndiff --git a/drivers/net/bnx2x/bnx2x_rxtx.c b/drivers/net/bnx2x/bnx2x_rxtx.c\nindex 5dd4aee7f..1a0c633b1 100644\n--- a/drivers/net/bnx2x/bnx2x_rxtx.c\n+++ b/drivers/net/bnx2x/bnx2x_rxtx.c\n@@ -60,7 +60,7 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t       uint16_t queue_idx,\n \t\t       uint16_t nb_desc,\n \t\t       unsigned int socket_id,\n-\t\t       __rte_unused const struct rte_eth_rxconf *rx_conf,\n+\t\t       __rte_unused const struct rte_eth_rxq_conf *rx_conf,\n \t\t       struct rte_mempool *mp)\n {\n \tuint16_t j, idx;\n@@ -246,7 +246,7 @@ bnx2x_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t       uint16_t queue_idx,\n \t\t       uint16_t nb_desc,\n \t\t       unsigned int socket_id,\n-\t\t       const struct rte_eth_txconf *tx_conf)\n+\t\t       const struct rte_eth_txq_conf *tx_conf)\n {\n \tuint16_t i;\n \tunsigned int tsize;\ndiff --git a/drivers/net/bnx2x/bnx2x_rxtx.h b/drivers/net/bnx2x/bnx2x_rxtx.h\nindex 2e38ec26a..1c6a6b38d 100644\n--- a/drivers/net/bnx2x/bnx2x_rxtx.h\n+++ b/drivers/net/bnx2x/bnx2x_rxtx.h\n@@ -68,12 +68,12 @@ struct bnx2x_tx_queue {\n \n int bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n \t\t\t      uint16_t nb_rx_desc, unsigned int socket_id,\n-\t\t\t      const struct rte_eth_rxconf *rx_conf,\n+\t\t\t      const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t      struct rte_mempool *mb_pool);\n \n int bnx2x_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n \t\t\t      uint16_t nb_tx_desc, unsigned int socket_id,\n-\t\t\t      const struct rte_eth_txconf *tx_conf);\n+\t\t\t      const struct rte_eth_txq_conf *tx_conf);\n \n void bnx2x_dev_rx_queue_release(void *rxq);\n void bnx2x_dev_tx_queue_release(void *txq);\ndiff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex c9d11228b..508e6b752 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -391,7 +391,7 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,\n \t\t\t\t\tDEV_TX_OFFLOAD_GENEVE_TNL_TSO;\n \n \t/* *INDENT-OFF* */\n-\tdev_info->default_rxconf = (struct rte_eth_rxconf) {\n+\tdev_info->default_rxconf = (struct rte_eth_rxq_conf) {\n \t\t.rx_thresh = {\n \t\t\t.pthresh = 8,\n \t\t\t.hthresh = 8,\n@@ -401,7 +401,7 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,\n \t\t.rx_drop_en = 0,\n \t};\n \n-\tdev_info->default_txconf = (struct rte_eth_txconf) {\n+\tdev_info->default_txconf = (struct rte_eth_txq_conf) {\n \t\t.tx_thresh = {\n \t\t\t.pthresh = 32,\n \t\t\t.hthresh = 0,\ndiff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c\nindex 0793820b1..d0ab47c36 100644\n--- a/drivers/net/bnxt/bnxt_rxq.c\n+++ b/drivers/net/bnxt/bnxt_rxq.c\n@@ -293,7 +293,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,\n \t\t\t       uint16_t queue_idx,\n \t\t\t       uint16_t nb_desc,\n \t\t\t       unsigned int socket_id,\n-\t\t\t       const struct rte_eth_rxconf *rx_conf,\n+\t\t\t       const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t       struct rte_mempool *mp)\n {\n \tstruct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;\ndiff --git a/drivers/net/bnxt/bnxt_rxq.h b/drivers/net/bnxt/bnxt_rxq.h\nindex 01aaa007f..29c0aa0a5 100644\n--- a/drivers/net/bnxt/bnxt_rxq.h\n+++ b/drivers/net/bnxt/bnxt_rxq.h\n@@ -70,7 +70,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,\n \t\t\t       uint16_t queue_idx,\n \t\t\t       uint16_t nb_desc,\n \t\t\t       unsigned int socket_id,\n-\t\t\t       const struct rte_eth_rxconf *rx_conf,\n+\t\t\t       const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t       struct rte_mempool *mp);\n void bnxt_free_rx_mbufs(struct bnxt *bp);\n \ndiff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c\nindex 99dddddfc..f4701bd68 100644\n--- a/drivers/net/bnxt/bnxt_txq.c\n+++ b/drivers/net/bnxt/bnxt_txq.c\n@@ -102,7 +102,7 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,\n \t\t\t       uint16_t queue_idx,\n \t\t\t       uint16_t nb_desc,\n \t\t\t       unsigned int socket_id,\n-\t\t\t       const struct rte_eth_txconf *tx_conf)\n+\t\t\t       const struct rte_eth_txq_conf *tx_conf)\n {\n \tstruct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;\n \tstruct bnxt_tx_queue *txq;\ndiff --git a/drivers/net/bnxt/bnxt_txq.h b/drivers/net/bnxt/bnxt_txq.h\nindex 16f3a0bdd..5071dfd5b 100644\n--- a/drivers/net/bnxt/bnxt_txq.h\n+++ b/drivers/net/bnxt/bnxt_txq.h\n@@ -70,6 +70,6 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,\n \t\t\t       uint16_t queue_idx,\n \t\t\t       uint16_t nb_desc,\n \t\t\t       unsigned int socket_id,\n-\t\t\t       const struct rte_eth_txconf *tx_conf);\n+\t\t\t       const struct rte_eth_txq_conf *tx_conf);\n \n #endif\ndiff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c\nindex 3ee70baa0..fbf7ffba5 100644\n--- a/drivers/net/bonding/rte_eth_bond_pmd.c\n+++ b/drivers/net/bonding/rte_eth_bond_pmd.c\n@@ -2153,7 +2153,8 @@ bond_ethdev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)\n static int\n bond_ethdev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n \t\tuint16_t nb_rx_desc, unsigned int socket_id __rte_unused,\n-\t\tconst struct rte_eth_rxconf *rx_conf, struct rte_mempool *mb_pool)\n+\t\tconst struct rte_eth_rxq_conf *rx_conf,\n+\t\tstruct rte_mempool *mb_pool)\n {\n \tstruct bond_rx_queue *bd_rx_q = (struct bond_rx_queue *)\n \t\t\trte_zmalloc_socket(NULL, sizeof(struct bond_rx_queue),\n@@ -2166,7 +2167,7 @@ bond_ethdev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n \n \tbd_rx_q->nb_rx_desc = nb_rx_desc;\n \n-\tmemcpy(&(bd_rx_q->rx_conf), rx_conf, sizeof(struct rte_eth_rxconf));\n+\tmemcpy(&(bd_rx_q->rx_conf), rx_conf, sizeof(struct rte_eth_rxq_conf));\n \tbd_rx_q->mb_pool = mb_pool;\n \n \tdev->data->rx_queues[rx_queue_id] = bd_rx_q;\n@@ -2177,7 +2178,7 @@ bond_ethdev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n static int\n bond_ethdev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n \t\tuint16_t nb_tx_desc, unsigned int socket_id __rte_unused,\n-\t\tconst struct rte_eth_txconf *tx_conf)\n+\t\tconst struct rte_eth_txq_conf *tx_conf)\n {\n \tstruct bond_tx_queue *bd_tx_q  = (struct bond_tx_queue *)\n \t\t\trte_zmalloc_socket(NULL, sizeof(struct bond_tx_queue),\ndiff --git a/drivers/net/bonding/rte_eth_bond_private.h b/drivers/net/bonding/rte_eth_bond_private.h\nindex 1fe6ff880..579a18c98 100644\n--- a/drivers/net/bonding/rte_eth_bond_private.h\n+++ b/drivers/net/bonding/rte_eth_bond_private.h\n@@ -74,7 +74,7 @@ struct bond_rx_queue {\n \t/**< Reference to eth_dev private structure */\n \tuint16_t nb_rx_desc;\n \t/**< Number of RX descriptors available for the queue */\n-\tstruct rte_eth_rxconf rx_conf;\n+\tstruct rte_eth_rxq_conf rx_conf;\n \t/**< Copy of RX configuration structure for queue */\n \tstruct rte_mempool *mb_pool;\n \t/**< Reference to mbuf pool to use for RX queue */\n@@ -87,7 +87,7 @@ struct bond_tx_queue {\n \t/**< Reference to dev private structure */\n \tuint16_t nb_tx_desc;\n \t/**< Number of TX descriptors available for the queue */\n-\tstruct rte_eth_txconf tx_conf;\n+\tstruct rte_eth_txq_conf tx_conf;\n \t/**< Copy of TX configuration structure for queue */\n };\n \ndiff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c\nindex 7bca45614..b8f965765 100644\n--- a/drivers/net/cxgbe/cxgbe_ethdev.c\n+++ b/drivers/net/cxgbe/cxgbe_ethdev.c\n@@ -443,7 +443,7 @@ static int cxgbe_dev_tx_queue_stop(struct rte_eth_dev *eth_dev,\n static int cxgbe_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,\n \t\t\t\t    uint16_t queue_idx,\tuint16_t nb_desc,\n \t\t\t\t    unsigned int socket_id,\n-\t\t\t\t    const struct rte_eth_txconf *tx_conf)\n+\t\t\t\t    const struct rte_eth_txq_conf *tx_conf)\n {\n \tstruct port_info *pi = (struct port_info *)(eth_dev->data->dev_private);\n \tstruct adapter *adapter = pi->adapter;\n@@ -552,7 +552,7 @@ static int cxgbe_dev_rx_queue_stop(struct rte_eth_dev *eth_dev,\n static int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,\n \t\t\t\t    uint16_t queue_idx,\tuint16_t nb_desc,\n \t\t\t\t    unsigned int socket_id,\n-\t\t\t\t    const struct rte_eth_rxconf *rx_conf,\n+\t\t\t\t    const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t\t    struct rte_mempool *mp)\n {\n \tstruct port_info *pi = (struct port_info *)(eth_dev->data->dev_private);\ndiff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c\nindex 429b3a086..80b79ecc2 100644\n--- a/drivers/net/dpaa2/dpaa2_ethdev.c\n+++ b/drivers/net/dpaa2/dpaa2_ethdev.c\n@@ -355,7 +355,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t uint16_t rx_queue_id,\n \t\t\t uint16_t nb_rx_desc __rte_unused,\n \t\t\t unsigned int socket_id __rte_unused,\n-\t\t\t const struct rte_eth_rxconf *rx_conf __rte_unused,\n+\t\t\t const struct rte_eth_rxq_conf *rx_conf __rte_unused,\n \t\t\t struct rte_mempool *mb_pool)\n {\n \tstruct dpaa2_dev_priv *priv = dev->data->dev_private;\n@@ -440,7 +440,7 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t uint16_t tx_queue_id,\n \t\t\t uint16_t nb_tx_desc __rte_unused,\n \t\t\t unsigned int socket_id __rte_unused,\n-\t\t\t const struct rte_eth_txconf *tx_conf __rte_unused)\n+\t\t\t const struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \tstruct dpaa2_dev_priv *priv = dev->data->dev_private;\n \tstruct dpaa2_queue *dpaa2_q = (struct dpaa2_queue *)\ndiff --git a/drivers/net/e1000/e1000_ethdev.h b/drivers/net/e1000/e1000_ethdev.h\nindex 5668910c5..6390cc137 100644\n--- a/drivers/net/e1000/e1000_ethdev.h\n+++ b/drivers/net/e1000/e1000_ethdev.h\n@@ -372,7 +372,7 @@ void igb_dev_free_queues(struct rte_eth_dev *dev);\n \n int eth_igb_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n \t\tuint16_t nb_rx_desc, unsigned int socket_id,\n-\t\tconst struct rte_eth_rxconf *rx_conf,\n+\t\tconst struct rte_eth_rxq_conf *rx_conf,\n \t\tstruct rte_mempool *mb_pool);\n \n uint32_t eth_igb_rx_queue_count(struct rte_eth_dev *dev,\n@@ -385,7 +385,7 @@ int eth_igb_tx_descriptor_status(void *tx_queue, uint16_t offset);\n \n int eth_igb_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n \t\tuint16_t nb_tx_desc, unsigned int socket_id,\n-\t\tconst struct rte_eth_txconf *tx_conf);\n+\t\tconst struct rte_eth_txq_conf *tx_conf);\n \n int eth_igb_tx_done_cleanup(void *txq, uint32_t free_cnt);\n \n@@ -441,7 +441,7 @@ void em_dev_free_queues(struct rte_eth_dev *dev);\n \n int eth_em_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n \t\tuint16_t nb_rx_desc, unsigned int socket_id,\n-\t\tconst struct rte_eth_rxconf *rx_conf,\n+\t\tconst struct rte_eth_rxq_conf *rx_conf,\n \t\tstruct rte_mempool *mb_pool);\n \n uint32_t eth_em_rx_queue_count(struct rte_eth_dev *dev,\n@@ -454,7 +454,7 @@ int eth_em_tx_descriptor_status(void *tx_queue, uint16_t offset);\n \n int eth_em_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n \t\tuint16_t nb_tx_desc, unsigned int socket_id,\n-\t\tconst struct rte_eth_txconf *tx_conf);\n+\t\tconst struct rte_eth_txq_conf *tx_conf);\n \n int eth_em_rx_init(struct rte_eth_dev *dev);\n \ndiff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c\nindex 31819c5bd..857b7167d 100644\n--- a/drivers/net/e1000/em_rxtx.c\n+++ b/drivers/net/e1000/em_rxtx.c\n@@ -1185,7 +1185,7 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t uint16_t queue_idx,\n \t\t\t uint16_t nb_desc,\n \t\t\t unsigned int socket_id,\n-\t\t\t const struct rte_eth_txconf *tx_conf)\n+\t\t\t const struct rte_eth_txq_conf *tx_conf)\n {\n \tconst struct rte_memzone *tz;\n \tstruct em_tx_queue *txq;\n@@ -1347,7 +1347,7 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,\n \t\tuint16_t queue_idx,\n \t\tuint16_t nb_desc,\n \t\tunsigned int socket_id,\n-\t\tconst struct rte_eth_rxconf *rx_conf,\n+\t\tconst struct rte_eth_rxq_conf *rx_conf,\n \t\tstruct rte_mempool *mp)\n {\n \tconst struct rte_memzone *rz;\ndiff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c\nindex e4f7a9faf..7ac3703ac 100644\n--- a/drivers/net/e1000/igb_ethdev.c\n+++ b/drivers/net/e1000/igb_ethdev.c\n@@ -2252,7 +2252,7 @@ eth_igb_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \tdev_info->reta_size = ETH_RSS_RETA_SIZE_128;\n \tdev_info->flow_type_rss_offloads = IGB_RSS_OFFLOAD_ALL;\n \n-\tdev_info->default_rxconf = (struct rte_eth_rxconf) {\n+\tdev_info->default_rxconf = (struct rte_eth_rxq_conf) {\n \t\t.rx_thresh = {\n \t\t\t.pthresh = IGB_DEFAULT_RX_PTHRESH,\n \t\t\t.hthresh = IGB_DEFAULT_RX_HTHRESH,\n@@ -2262,7 +2262,7 @@ eth_igb_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t\t.rx_drop_en = 0,\n \t};\n \n-\tdev_info->default_txconf = (struct rte_eth_txconf) {\n+\tdev_info->default_txconf = (struct rte_eth_txq_conf) {\n \t\t.tx_thresh = {\n \t\t\t.pthresh = IGB_DEFAULT_TX_PTHRESH,\n \t\t\t.hthresh = IGB_DEFAULT_TX_HTHRESH,\n@@ -2339,7 +2339,7 @@ eth_igbvf_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t\tbreak;\n \t}\n \n-\tdev_info->default_rxconf = (struct rte_eth_rxconf) {\n+\tdev_info->default_rxconf = (struct rte_eth_rxq_conf) {\n \t\t.rx_thresh = {\n \t\t\t.pthresh = IGB_DEFAULT_RX_PTHRESH,\n \t\t\t.hthresh = IGB_DEFAULT_RX_HTHRESH,\n@@ -2349,7 +2349,7 @@ eth_igbvf_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t\t.rx_drop_en = 0,\n \t};\n \n-\tdev_info->default_txconf = (struct rte_eth_txconf) {\n+\tdev_info->default_txconf = (struct rte_eth_txq_conf) {\n \t\t.tx_thresh = {\n \t\t\t.pthresh = IGB_DEFAULT_TX_PTHRESH,\n \t\t\t.hthresh = IGB_DEFAULT_TX_HTHRESH,\ndiff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c\nindex 1c80a2a1b..f4a7fe571 100644\n--- a/drivers/net/e1000/igb_rxtx.c\n+++ b/drivers/net/e1000/igb_rxtx.c\n@@ -1458,7 +1458,7 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t uint16_t queue_idx,\n \t\t\t uint16_t nb_desc,\n \t\t\t unsigned int socket_id,\n-\t\t\t const struct rte_eth_txconf *tx_conf)\n+\t\t\t const struct rte_eth_txq_conf *tx_conf)\n {\n \tconst struct rte_memzone *tz;\n \tstruct igb_tx_queue *txq;\n@@ -1604,7 +1604,7 @@ eth_igb_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t uint16_t queue_idx,\n \t\t\t uint16_t nb_desc,\n \t\t\t unsigned int socket_id,\n-\t\t\t const struct rte_eth_rxconf *rx_conf,\n+\t\t\t const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t struct rte_mempool *mp)\n {\n \tconst struct rte_memzone *rz;\ndiff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex 80ce1f353..69fe5218d 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -193,10 +193,10 @@ static uint16_t eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\tuint16_t nb_pkts);\n static int ena_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \t\t\t      uint16_t nb_desc, unsigned int socket_id,\n-\t\t\t      const struct rte_eth_txconf *tx_conf);\n+\t\t\t      const struct rte_eth_txq_conf *tx_conf);\n static int ena_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \t\t\t      uint16_t nb_desc, unsigned int socket_id,\n-\t\t\t      const struct rte_eth_rxconf *rx_conf,\n+\t\t\t      const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t      struct rte_mempool *mp);\n static uint16_t eth_ena_recv_pkts(void *rx_queue,\n \t\t\t\t  struct rte_mbuf **rx_pkts, uint16_t nb_pkts);\n@@ -940,11 +940,12 @@ static int ena_queue_restart(struct ena_ring *ring)\n \treturn 0;\n }\n \n-static int ena_tx_queue_setup(struct rte_eth_dev *dev,\n-\t\t\t      uint16_t queue_idx,\n-\t\t\t      uint16_t nb_desc,\n-\t\t\t      __rte_unused unsigned int socket_id,\n-\t\t\t      __rte_unused const struct rte_eth_txconf *tx_conf)\n+static int ena_tx_queue_setup(\n+\t\tstruct rte_eth_dev *dev,\n+\t\tuint16_t queue_idx,\n+\t\tuint16_t nb_desc,\n+\t\t__rte_unused unsigned int socket_id,\n+\t\t__rte_unused const struct rte_eth_txq_conf *tx_conf)\n {\n \tstruct ena_com_create_io_ctx ctx =\n \t\t/* policy set to _HOST just to satisfy icc compiler */\n@@ -1042,12 +1043,13 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,\n \treturn rc;\n }\n \n-static int ena_rx_queue_setup(struct rte_eth_dev *dev,\n-\t\t\t      uint16_t queue_idx,\n-\t\t\t      uint16_t nb_desc,\n-\t\t\t      __rte_unused unsigned int socket_id,\n-\t\t\t      __rte_unused const struct rte_eth_rxconf *rx_conf,\n-\t\t\t      struct rte_mempool *mp)\n+static int ena_rx_queue_setup(\n+\t\tstruct rte_eth_dev *dev,\n+\t\tuint16_t queue_idx,\n+\t\tuint16_t nb_desc,\n+\t\t__rte_unused unsigned int socket_id,\n+\t\t__rte_unused const struct rte_eth_rxq_conf *rx_conf,\n+\t\tstruct rte_mempool *mp)\n {\n \tstruct ena_com_create_io_ctx ctx =\n \t\t/* policy set to _HOST just to satisfy icc compiler */\ndiff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c\nindex da8fec2d0..da7e88d23 100644\n--- a/drivers/net/enic/enic_ethdev.c\n+++ b/drivers/net/enic/enic_ethdev.c\n@@ -191,7 +191,7 @@ static int enicpmd_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,\n \tuint16_t queue_idx,\n \tuint16_t nb_desc,\n \tunsigned int socket_id,\n-\t__rte_unused const struct rte_eth_txconf *tx_conf)\n+\t__rte_unused const struct rte_eth_txq_conf *tx_conf)\n {\n \tint ret;\n \tstruct enic *enic = pmd_priv(eth_dev);\n@@ -303,7 +303,7 @@ static int enicpmd_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,\n \tuint16_t queue_idx,\n \tuint16_t nb_desc,\n \tunsigned int socket_id,\n-\tconst struct rte_eth_rxconf *rx_conf,\n+\tconst struct rte_eth_rxq_conf *rx_conf,\n \tstruct rte_mempool *mp)\n {\n \tint ret;\n@@ -485,7 +485,7 @@ static void enicpmd_dev_info_get(struct rte_eth_dev *eth_dev,\n \t\tDEV_TX_OFFLOAD_UDP_CKSUM   |\n \t\tDEV_TX_OFFLOAD_TCP_CKSUM   |\n \t\tDEV_TX_OFFLOAD_TCP_TSO;\n-\tdevice_info->default_rxconf = (struct rte_eth_rxconf) {\n+\tdevice_info->default_rxconf = (struct rte_eth_rxq_conf) {\n \t\t.rx_free_thresh = ENIC_DEFAULT_RX_FREE_THRESH\n \t};\n }\ndiff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c\nindex ff9ad155c..6f3f5ef56 100644\n--- a/drivers/net/failsafe/failsafe_ops.c\n+++ b/drivers/net/failsafe/failsafe_ops.c\n@@ -384,7 +384,7 @@ fs_rx_queue_setup(struct rte_eth_dev *dev,\n \t\tuint16_t rx_queue_id,\n \t\tuint16_t nb_rx_desc,\n \t\tunsigned int socket_id,\n-\t\tconst struct rte_eth_rxconf *rx_conf,\n+\t\tconst struct rte_eth_rxq_conf *rx_conf,\n \t\tstruct rte_mempool *mb_pool)\n {\n \tstruct sub_device *sdev;\n@@ -452,7 +452,7 @@ fs_tx_queue_setup(struct rte_eth_dev *dev,\n \t\tuint16_t tx_queue_id,\n \t\tuint16_t nb_tx_desc,\n \t\tunsigned int socket_id,\n-\t\tconst struct rte_eth_txconf *tx_conf)\n+\t\tconst struct rte_eth_txq_conf *tx_conf)\n {\n \tstruct sub_device *sdev;\n \tstruct txq *txq;\ndiff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c\nindex e60d3a365..d6d9d9169 100644\n--- a/drivers/net/fm10k/fm10k_ethdev.c\n+++ b/drivers/net/fm10k/fm10k_ethdev.c\n@@ -1427,7 +1427,7 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,\n \tdev_info->hash_key_size = FM10K_RSSRK_SIZE * sizeof(uint32_t);\n \tdev_info->reta_size = FM10K_MAX_RSS_INDICES;\n \n-\tdev_info->default_rxconf = (struct rte_eth_rxconf) {\n+\tdev_info->default_rxconf = (struct rte_eth_rxq_conf) {\n \t\t.rx_thresh = {\n \t\t\t.pthresh = FM10K_DEFAULT_RX_PTHRESH,\n \t\t\t.hthresh = FM10K_DEFAULT_RX_HTHRESH,\n@@ -1437,7 +1437,7 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,\n \t\t.rx_drop_en = 0,\n \t};\n \n-\tdev_info->default_txconf = (struct rte_eth_txconf) {\n+\tdev_info->default_txconf = (struct rte_eth_txq_conf) {\n \t\t.tx_thresh = {\n \t\t\t.pthresh = FM10K_DEFAULT_TX_PTHRESH,\n \t\t\t.hthresh = FM10K_DEFAULT_TX_HTHRESH,\n@@ -1740,7 +1740,7 @@ check_thresh(uint16_t min, uint16_t max, uint16_t div, uint16_t request)\n }\n \n static inline int\n-handle_rxconf(struct fm10k_rx_queue *q, const struct rte_eth_rxconf *conf)\n+handle_rxconf(struct fm10k_rx_queue *q, const struct rte_eth_rxq_conf *conf)\n {\n \tuint16_t rx_free_thresh;\n \n@@ -1805,7 +1805,7 @@ mempool_element_size_valid(struct rte_mempool *mp)\n static int\n fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,\n \tuint16_t nb_desc, unsigned int socket_id,\n-\tconst struct rte_eth_rxconf *conf, struct rte_mempool *mp)\n+\tconst struct rte_eth_rxq_conf *conf, struct rte_mempool *mp)\n {\n \tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tstruct fm10k_dev_info *dev_info =\n@@ -1912,7 +1912,7 @@ fm10k_rx_queue_release(void *queue)\n }\n \n static inline int\n-handle_txconf(struct fm10k_tx_queue *q, const struct rte_eth_txconf *conf)\n+handle_txconf(struct fm10k_tx_queue *q, const struct rte_eth_txq_conf *conf)\n {\n \tuint16_t tx_free_thresh;\n \tuint16_t tx_rs_thresh;\n@@ -1971,7 +1971,7 @@ handle_txconf(struct fm10k_tx_queue *q, const struct rte_eth_txconf *conf)\n static int\n fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,\n \tuint16_t nb_desc, unsigned int socket_id,\n-\tconst struct rte_eth_txconf *conf)\n+\tconst struct rte_eth_txq_conf *conf)\n {\n \tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tstruct fm10k_tx_queue *q;\ndiff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c\nindex 8e0580c56..9dc422cbb 100644\n--- a/drivers/net/i40e/i40e_ethdev.c\n+++ b/drivers/net/i40e/i40e_ethdev.c\n@@ -2973,7 +2973,7 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \tdev_info->reta_size = pf->hash_lut_size;\n \tdev_info->flow_type_rss_offloads = I40E_RSS_OFFLOAD_ALL;\n \n-\tdev_info->default_rxconf = (struct rte_eth_rxconf) {\n+\tdev_info->default_rxconf = (struct rte_eth_rxq_conf) {\n \t\t.rx_thresh = {\n \t\t\t.pthresh = I40E_DEFAULT_RX_PTHRESH,\n \t\t\t.hthresh = I40E_DEFAULT_RX_HTHRESH,\n@@ -2983,7 +2983,7 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t\t.rx_drop_en = 0,\n \t};\n \n-\tdev_info->default_txconf = (struct rte_eth_txconf) {\n+\tdev_info->default_txconf = (struct rte_eth_txq_conf) {\n \t\t.tx_thresh = {\n \t\t\t.pthresh = I40E_DEFAULT_TX_PTHRESH,\n \t\t\t.hthresh = I40E_DEFAULT_TX_HTHRESH,\ndiff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c\nindex 7c5c16b85..61938d487 100644\n--- a/drivers/net/i40e/i40e_ethdev_vf.c\n+++ b/drivers/net/i40e/i40e_ethdev_vf.c\n@@ -2144,7 +2144,7 @@ i40evf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t\tDEV_TX_OFFLOAD_TCP_CKSUM |\n \t\tDEV_TX_OFFLOAD_SCTP_CKSUM;\n \n-\tdev_info->default_rxconf = (struct rte_eth_rxconf) {\n+\tdev_info->default_rxconf = (struct rte_eth_rxq_conf) {\n \t\t.rx_thresh = {\n \t\t\t.pthresh = I40E_DEFAULT_RX_PTHRESH,\n \t\t\t.hthresh = I40E_DEFAULT_RX_HTHRESH,\n@@ -2154,7 +2154,7 @@ i40evf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t\t.rx_drop_en = 0,\n \t};\n \n-\tdev_info->default_txconf = (struct rte_eth_txconf) {\n+\tdev_info->default_txconf = (struct rte_eth_txq_conf) {\n \t\t.tx_thresh = {\n \t\t\t.pthresh = I40E_DEFAULT_TX_PTHRESH,\n \t\t\t.hthresh = I40E_DEFAULT_TX_HTHRESH,\ndiff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c\nindex d42c23c05..f4e367db8 100644\n--- a/drivers/net/i40e/i40e_rxtx.c\n+++ b/drivers/net/i40e/i40e_rxtx.c\n@@ -1731,7 +1731,7 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\tuint16_t queue_idx,\n \t\t\tuint16_t nb_desc,\n \t\t\tunsigned int socket_id,\n-\t\t\tconst struct rte_eth_rxconf *rx_conf,\n+\t\t\tconst struct rte_eth_rxq_conf *rx_conf,\n \t\t\tstruct rte_mempool *mp)\n {\n \tstruct i40e_vsi *vsi;\n@@ -2010,7 +2010,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\tuint16_t queue_idx,\n \t\t\tuint16_t nb_desc,\n \t\t\tunsigned int socket_id,\n-\t\t\tconst struct rte_eth_txconf *tx_conf)\n+\t\t\tconst struct rte_eth_txq_conf *tx_conf)\n {\n \tstruct i40e_vsi *vsi;\n \tstruct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);\ndiff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h\nindex 20084d649..9d48e33f9 100644\n--- a/drivers/net/i40e/i40e_rxtx.h\n+++ b/drivers/net/i40e/i40e_rxtx.h\n@@ -201,13 +201,13 @@ int i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t    uint16_t queue_idx,\n \t\t\t    uint16_t nb_desc,\n \t\t\t    unsigned int socket_id,\n-\t\t\t    const struct rte_eth_rxconf *rx_conf,\n+\t\t\t    const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t    struct rte_mempool *mp);\n int i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t    uint16_t queue_idx,\n \t\t\t    uint16_t nb_desc,\n \t\t\t    unsigned int socket_id,\n-\t\t\t    const struct rte_eth_txconf *tx_conf);\n+\t\t\t    const struct rte_eth_txq_conf *tx_conf);\n void i40e_dev_rx_queue_release(void *rxq);\n void i40e_dev_tx_queue_release(void *txq);\n uint16_t i40e_recv_pkts(void *rx_queue,\ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex 22171d866..7022f2ecc 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -3665,7 +3665,7 @@ ixgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t    hw->mac.type == ixgbe_mac_X550EM_a)\n \t\tdev_info->tx_offload_capa |= DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;\n \n-\tdev_info->default_rxconf = (struct rte_eth_rxconf) {\n+\tdev_info->default_rxconf = (struct rte_eth_rxq_conf) {\n \t\t.rx_thresh = {\n \t\t\t.pthresh = IXGBE_DEFAULT_RX_PTHRESH,\n \t\t\t.hthresh = IXGBE_DEFAULT_RX_HTHRESH,\n@@ -3675,7 +3675,7 @@ ixgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t\t.rx_drop_en = 0,\n \t};\n \n-\tdev_info->default_txconf = (struct rte_eth_txconf) {\n+\tdev_info->default_txconf = (struct rte_eth_txq_conf) {\n \t\t.tx_thresh = {\n \t\t\t.pthresh = IXGBE_DEFAULT_TX_PTHRESH,\n \t\t\t.hthresh = IXGBE_DEFAULT_TX_HTHRESH,\n@@ -3776,7 +3776,7 @@ ixgbevf_dev_info_get(struct rte_eth_dev *dev,\n \t\t\t\tDEV_TX_OFFLOAD_SCTP_CKSUM  |\n \t\t\t\tDEV_TX_OFFLOAD_TCP_TSO;\n \n-\tdev_info->default_rxconf = (struct rte_eth_rxconf) {\n+\tdev_info->default_rxconf = (struct rte_eth_rxq_conf) {\n \t\t.rx_thresh = {\n \t\t\t.pthresh = IXGBE_DEFAULT_RX_PTHRESH,\n \t\t\t.hthresh = IXGBE_DEFAULT_RX_HTHRESH,\n@@ -3786,7 +3786,7 @@ ixgbevf_dev_info_get(struct rte_eth_dev *dev,\n \t\t.rx_drop_en = 0,\n \t};\n \n-\tdev_info->default_txconf = (struct rte_eth_txconf) {\n+\tdev_info->default_txconf = (struct rte_eth_txq_conf) {\n \t\t.tx_thresh = {\n \t\t\t.pthresh = IXGBE_DEFAULT_TX_PTHRESH,\n \t\t\t.hthresh = IXGBE_DEFAULT_TX_HTHRESH,\ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h\nindex caa50c8b9..4085a704a 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.h\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.h\n@@ -599,12 +599,12 @@ void ixgbe_dev_tx_queue_release(void *txq);\n \n int  ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n \t\tuint16_t nb_rx_desc, unsigned int socket_id,\n-\t\tconst struct rte_eth_rxconf *rx_conf,\n+\t\tconst struct rte_eth_rxq_conf *rx_conf,\n \t\tstruct rte_mempool *mb_pool);\n \n int  ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n \t\tuint16_t nb_tx_desc, unsigned int socket_id,\n-\t\tconst struct rte_eth_txconf *tx_conf);\n+\t\tconst struct rte_eth_txq_conf *tx_conf);\n \n uint32_t ixgbe_dev_rx_queue_count(struct rte_eth_dev *dev,\n \t\tuint16_t rx_queue_id);\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c\nindex 98d0e1a86..b6b21403d 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx.c\n+++ b/drivers/net/ixgbe/ixgbe_rxtx.c\n@@ -2397,7 +2397,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t uint16_t queue_idx,\n \t\t\t uint16_t nb_desc,\n \t\t\t unsigned int socket_id,\n-\t\t\t const struct rte_eth_txconf *tx_conf)\n+\t\t\t const struct rte_eth_txq_conf *tx_conf)\n {\n \tconst struct rte_memzone *tz;\n \tstruct ixgbe_tx_queue *txq;\n@@ -2752,7 +2752,7 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t uint16_t queue_idx,\n \t\t\t uint16_t nb_desc,\n \t\t\t unsigned int socket_id,\n-\t\t\t const struct rte_eth_rxconf *rx_conf,\n+\t\t\t const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t struct rte_mempool *mp)\n {\n \tconst struct rte_memzone *rz;\ndiff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c\nindex 72a2733ba..e2ef7644f 100644\n--- a/drivers/net/kni/rte_eth_kni.c\n+++ b/drivers/net/kni/rte_eth_kni.c\n@@ -238,7 +238,7 @@ eth_kni_rx_queue_setup(struct rte_eth_dev *dev,\n \t\tuint16_t rx_queue_id,\n \t\tuint16_t nb_rx_desc __rte_unused,\n \t\tunsigned int socket_id __rte_unused,\n-\t\tconst struct rte_eth_rxconf *rx_conf __rte_unused,\n+\t\tconst struct rte_eth_rxq_conf *rx_conf __rte_unused,\n \t\tstruct rte_mempool *mb_pool)\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n@@ -258,7 +258,7 @@ eth_kni_tx_queue_setup(struct rte_eth_dev *dev,\n \t\tuint16_t tx_queue_id,\n \t\tuint16_t nb_tx_desc __rte_unused,\n \t\tunsigned int socket_id __rte_unused,\n-\t\tconst struct rte_eth_txconf *tx_conf __rte_unused)\n+\t\tconst struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n \tstruct pmd_queue *q;\ndiff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c\nindex a17fba501..e1bbddde7 100644\n--- a/drivers/net/liquidio/lio_ethdev.c\n+++ b/drivers/net/liquidio/lio_ethdev.c\n@@ -1150,7 +1150,7 @@ lio_dev_mq_rx_configure(struct rte_eth_dev *eth_dev)\n  * @param socket_id\n  *    Where to allocate memory\n  * @param rx_conf\n- *    Pointer to the struction rte_eth_rxconf\n+ *    Pointer to the struction rte_eth_rxq_conf\n  * @param mp\n  *    Pointer to the packet pool\n  *\n@@ -1161,7 +1161,7 @@ lio_dev_mq_rx_configure(struct rte_eth_dev *eth_dev)\n static int\n lio_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t q_no,\n \t\t       uint16_t num_rx_descs, unsigned int socket_id,\n-\t\t       const struct rte_eth_rxconf *rx_conf __rte_unused,\n+\t\t       const struct rte_eth_rxq_conf *rx_conf __rte_unused,\n \t\t       struct rte_mempool *mp)\n {\n \tstruct lio_device *lio_dev = LIO_DEV(eth_dev);\n@@ -1242,7 +1242,7 @@ lio_dev_rx_queue_release(void *rxq)\n  *   NUMA socket id, used for memory allocations\n  *\n  * @param tx_conf\n- *   Pointer to the structure rte_eth_txconf\n+ *   Pointer to the structure rte_eth_txq_conf\n  *\n  * @return\n  *   - On success, return 0\n@@ -1251,7 +1251,7 @@ lio_dev_rx_queue_release(void *rxq)\n static int\n lio_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t q_no,\n \t\t       uint16_t num_tx_descs, unsigned int socket_id,\n-\t\t       const struct rte_eth_txconf *tx_conf __rte_unused)\n+\t\t       const struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \tstruct lio_device *lio_dev = LIO_DEV(eth_dev);\n \tint fw_mapped_iq = lio_dev->linfo.txpciq[q_no].s.q_no;\ndiff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c\nindex 055de49a3..2db8b5646 100644\n--- a/drivers/net/mlx4/mlx4.c\n+++ b/drivers/net/mlx4/mlx4.c\n@@ -539,7 +539,7 @@ priv_set_flags(struct priv *priv, unsigned int keep, unsigned int flags)\n \n static int\n txq_setup(struct rte_eth_dev *dev, struct txq *txq, uint16_t desc,\n-\t  unsigned int socket, const struct rte_eth_txconf *conf);\n+\t  unsigned int socket, const struct rte_eth_txq_conf *conf);\n \n static void\n txq_cleanup(struct txq *txq);\n@@ -547,7 +547,7 @@ txq_cleanup(struct txq *txq);\n static int\n rxq_setup(struct rte_eth_dev *dev, struct rxq *rxq, uint16_t desc,\n \t  unsigned int socket, int inactive,\n-\t  const struct rte_eth_rxconf *conf,\n+\t  const struct rte_eth_rxq_conf *conf,\n \t  struct rte_mempool *mp, int children_n,\n \t  struct rxq *rxq_parent);\n \n@@ -1762,7 +1762,7 @@ mlx4_tx_burst_secondary_setup(void *dpdk_txq, struct rte_mbuf **pkts,\n  */\n static int\n txq_setup(struct rte_eth_dev *dev, struct txq *txq, uint16_t desc,\n-\t  unsigned int socket, const struct rte_eth_txconf *conf)\n+\t  unsigned int socket, const struct rte_eth_txq_conf *conf)\n {\n \tstruct priv *priv = mlx4_get_priv(dev);\n \tstruct txq tmpl = {\n@@ -1954,7 +1954,7 @@ txq_setup(struct rte_eth_dev *dev, struct txq *txq, uint16_t desc,\n  */\n static int\n mlx4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n-\t\t    unsigned int socket, const struct rte_eth_txconf *conf)\n+\t\t    unsigned int socket, const struct rte_eth_txq_conf *conf)\n {\n \tstruct priv *priv = dev->data->dev_private;\n \tstruct txq *txq = (*priv->txqs)[idx];\n@@ -3830,7 +3830,7 @@ rxq_create_qp(struct rxq *rxq,\n static int\n rxq_setup(struct rte_eth_dev *dev, struct rxq *rxq, uint16_t desc,\n \t  unsigned int socket, int inactive,\n-\t  const struct rte_eth_rxconf *conf,\n+\t  const struct rte_eth_rxq_conf *conf,\n \t  struct rte_mempool *mp, int children_n,\n \t  struct rxq *rxq_parent)\n {\n@@ -4007,7 +4007,7 @@ rxq_setup(struct rte_eth_dev *dev, struct rxq *rxq, uint16_t desc,\n  */\n static int\n mlx4_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n-\t\t    unsigned int socket, const struct rte_eth_rxconf *conf,\n+\t\t    unsigned int socket, const struct rte_eth_rxq_conf *conf,\n \t\t    struct rte_mempool *mp)\n {\n \tstruct rxq *parent;\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 35c5cb42e..85428950c 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -843,7 +843,7 @@ rxq_setup(struct rxq_ctrl *tmpl)\n static int\n rxq_ctrl_setup(struct rte_eth_dev *dev, struct rxq_ctrl *rxq_ctrl,\n \t       uint16_t desc, unsigned int socket,\n-\t       const struct rte_eth_rxconf *conf, struct rte_mempool *mp)\n+\t       const struct rte_eth_rxq_conf *conf, struct rte_mempool *mp)\n {\n \tstruct priv *priv = dev->data->dev_private;\n \tstruct rxq_ctrl tmpl = {\n@@ -1110,7 +1110,7 @@ rxq_ctrl_setup(struct rte_eth_dev *dev, struct rxq_ctrl *rxq_ctrl,\n  */\n int\n mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n-\t\t    unsigned int socket, const struct rte_eth_rxconf *conf,\n+\t\t    unsigned int socket, const struct rte_eth_rxq_conf *conf,\n \t\t    struct rte_mempool *mp)\n {\n \tstruct priv *priv = dev->data->dev_private;\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h\nindex 033e70f25..eb5315760 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.h\n+++ b/drivers/net/mlx5/mlx5_rxtx.h\n@@ -301,7 +301,7 @@ int priv_allow_flow_type(struct priv *, enum hash_rxq_flow_type);\n int priv_rehash_flows(struct priv *);\n void rxq_cleanup(struct rxq_ctrl *);\n int mlx5_rx_queue_setup(struct rte_eth_dev *, uint16_t, uint16_t, unsigned int,\n-\t\t\tconst struct rte_eth_rxconf *, struct rte_mempool *);\n+\t\t\tconst struct rte_eth_rxq_conf *, struct rte_mempool *);\n void mlx5_rx_queue_release(void *);\n int priv_rx_intr_vec_enable(struct priv *priv);\n void priv_rx_intr_vec_disable(struct priv *priv);\n@@ -314,9 +314,9 @@ int mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id);\n \n void txq_cleanup(struct txq_ctrl *);\n int txq_ctrl_setup(struct rte_eth_dev *, struct txq_ctrl *, uint16_t,\n-\t\t   unsigned int, const struct rte_eth_txconf *);\n+\t\t   unsigned int, const struct rte_eth_txq_conf *);\n int mlx5_tx_queue_setup(struct rte_eth_dev *, uint16_t, uint16_t, unsigned int,\n-\t\t\tconst struct rte_eth_txconf *);\n+\t\t\tconst struct rte_eth_txq_conf *);\n void mlx5_tx_queue_release(void *);\n \n /* mlx5_rxtx.c */\ndiff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c\nindex 4b0b532b1..7b8c2f766 100644\n--- a/drivers/net/mlx5/mlx5_txq.c\n+++ b/drivers/net/mlx5/mlx5_txq.c\n@@ -211,7 +211,7 @@ txq_setup(struct txq_ctrl *tmpl, struct txq_ctrl *txq_ctrl)\n int\n txq_ctrl_setup(struct rte_eth_dev *dev, struct txq_ctrl *txq_ctrl,\n \t       uint16_t desc, unsigned int socket,\n-\t       const struct rte_eth_txconf *conf)\n+\t       const struct rte_eth_txq_conf *conf)\n {\n \tstruct priv *priv = mlx5_get_priv(dev);\n \tstruct txq_ctrl tmpl = {\n@@ -413,7 +413,7 @@ txq_ctrl_setup(struct rte_eth_dev *dev, struct txq_ctrl *txq_ctrl,\n  */\n int\n mlx5_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n-\t\t    unsigned int socket, const struct rte_eth_txconf *conf)\n+\t\t    unsigned int socket, const struct rte_eth_txq_conf *conf)\n {\n \tstruct priv *priv = dev->data->dev_private;\n \tstruct txq *txq = (*priv->txqs)[idx];\ndiff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c\nindex a3bf5e1f1..4122824d9 100644\n--- a/drivers/net/nfp/nfp_net.c\n+++ b/drivers/net/nfp/nfp_net.c\n@@ -79,13 +79,13 @@ static uint16_t nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n static void nfp_net_rx_queue_release(void *rxq);\n static int nfp_net_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \t\t\t\t  uint16_t nb_desc, unsigned int socket_id,\n-\t\t\t\t  const struct rte_eth_rxconf *rx_conf,\n+\t\t\t\t  const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t\t  struct rte_mempool *mp);\n static int nfp_net_tx_free_bufs(struct nfp_net_txq *txq);\n static void nfp_net_tx_queue_release(void *txq);\n static int nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \t\t\t\t  uint16_t nb_desc, unsigned int socket_id,\n-\t\t\t\t  const struct rte_eth_txconf *tx_conf);\n+\t\t\t\t  const struct rte_eth_txq_conf *tx_conf);\n static int nfp_net_start(struct rte_eth_dev *dev);\n static void nfp_net_stats_get(struct rte_eth_dev *dev,\n \t\t\t      struct rte_eth_stats *stats);\n@@ -1119,7 +1119,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t\t\t\t\t     DEV_TX_OFFLOAD_UDP_CKSUM |\n \t\t\t\t\t     DEV_TX_OFFLOAD_TCP_CKSUM;\n \n-\tdev_info->default_rxconf = (struct rte_eth_rxconf) {\n+\tdev_info->default_rxconf = (struct rte_eth_rxq_conf) {\n \t\t.rx_thresh = {\n \t\t\t.pthresh = DEFAULT_RX_PTHRESH,\n \t\t\t.hthresh = DEFAULT_RX_HTHRESH,\n@@ -1129,7 +1129,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t\t.rx_drop_en = 0,\n \t};\n \n-\tdev_info->default_txconf = (struct rte_eth_txconf) {\n+\tdev_info->default_txconf = (struct rte_eth_txq_conf) {\n \t\t.tx_thresh = {\n \t\t\t.pthresh = DEFAULT_TX_PTHRESH,\n \t\t\t.hthresh = DEFAULT_TX_HTHRESH,\n@@ -1388,7 +1388,7 @@ static int\n nfp_net_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t       uint16_t queue_idx, uint16_t nb_desc,\n \t\t       unsigned int socket_id,\n-\t\t       const struct rte_eth_rxconf *rx_conf,\n+\t\t       const struct rte_eth_rxq_conf *rx_conf,\n \t\t       struct rte_mempool *mp)\n {\n \tconst struct rte_memzone *tz;\n@@ -1537,7 +1537,7 @@ nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq)\n static int\n nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \t\t       uint16_t nb_desc, unsigned int socket_id,\n-\t\t       const struct rte_eth_txconf *tx_conf)\n+\t\t       const struct rte_eth_txq_conf *tx_conf)\n {\n \tconst struct rte_memzone *tz;\n \tstruct nfp_net_txq *txq;\ndiff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c\nindex 5aef0591e..7ae14b77b 100644\n--- a/drivers/net/null/rte_eth_null.c\n+++ b/drivers/net/null/rte_eth_null.c\n@@ -214,7 +214,7 @@ static int\n eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n \t\tuint16_t nb_rx_desc __rte_unused,\n \t\tunsigned int socket_id __rte_unused,\n-\t\tconst struct rte_eth_rxconf *rx_conf __rte_unused,\n+\t\tconst struct rte_eth_rxq_conf *rx_conf __rte_unused,\n \t\tstruct rte_mempool *mb_pool)\n {\n \tstruct rte_mbuf *dummy_packet;\n@@ -249,7 +249,7 @@ static int\n eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n \t\tuint16_t nb_tx_desc __rte_unused,\n \t\tunsigned int socket_id __rte_unused,\n-\t\tconst struct rte_eth_txconf *tx_conf __rte_unused)\n+\t\tconst struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \tstruct rte_mbuf *dummy_packet;\n \tstruct pmd_internals *internals;\ndiff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c\nindex defb3b419..874856712 100644\n--- a/drivers/net/pcap/rte_eth_pcap.c\n+++ b/drivers/net/pcap/rte_eth_pcap.c\n@@ -634,7 +634,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,\n \t\tuint16_t rx_queue_id,\n \t\tuint16_t nb_rx_desc __rte_unused,\n \t\tunsigned int socket_id __rte_unused,\n-\t\tconst struct rte_eth_rxconf *rx_conf __rte_unused,\n+\t\tconst struct rte_eth_rxq_conf *rx_conf __rte_unused,\n \t\tstruct rte_mempool *mb_pool)\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n@@ -652,7 +652,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev,\n \t\tuint16_t tx_queue_id,\n \t\tuint16_t nb_tx_desc __rte_unused,\n \t\tunsigned int socket_id __rte_unused,\n-\t\tconst struct rte_eth_txconf *tx_conf __rte_unused)\n+\t\tconst struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n \ndiff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c\nindex 4e9e89fad..5b6df9688 100644\n--- a/drivers/net/qede/qede_ethdev.c\n+++ b/drivers/net/qede/qede_ethdev.c\n@@ -1293,7 +1293,7 @@ qede_dev_info_get(struct rte_eth_dev *eth_dev,\n \tdev_info->hash_key_size = ECORE_RSS_KEY_SIZE * sizeof(uint32_t);\n \tdev_info->flow_type_rss_offloads = (uint64_t)QEDE_RSS_OFFLOAD_ALL;\n \n-\tdev_info->default_txconf = (struct rte_eth_txconf) {\n+\tdev_info->default_txconf = (struct rte_eth_txq_conf) {\n \t\t.txq_flags = QEDE_TXQ_FLAGS,\n \t};\n \ndiff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c\nindex 5c3613c7c..98da5f975 100644\n--- a/drivers/net/qede/qede_rxtx.c\n+++ b/drivers/net/qede/qede_rxtx.c\n@@ -40,7 +40,7 @@ static inline int qede_alloc_rx_buffer(struct qede_rx_queue *rxq)\n int\n qede_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \t\t    uint16_t nb_desc, unsigned int socket_id,\n-\t\t    __rte_unused const struct rte_eth_rxconf *rx_conf,\n+\t\t    __rte_unused const struct rte_eth_rxq_conf *rx_conf,\n \t\t    struct rte_mempool *mp)\n {\n \tstruct qede_dev *qdev = QEDE_INIT_QDEV(dev);\n@@ -238,7 +238,7 @@ qede_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t    uint16_t queue_idx,\n \t\t    uint16_t nb_desc,\n \t\t    unsigned int socket_id,\n-\t\t    const struct rte_eth_txconf *tx_conf)\n+\t\t    const struct rte_eth_txq_conf *tx_conf)\n {\n \tstruct qede_dev *qdev = dev->data->dev_private;\n \tstruct ecore_dev *edev = &qdev->edev;\ndiff --git a/drivers/net/qede/qede_rxtx.h b/drivers/net/qede/qede_rxtx.h\nindex b551fd6ae..0c10b8ebe 100644\n--- a/drivers/net/qede/qede_rxtx.h\n+++ b/drivers/net/qede/qede_rxtx.h\n@@ -225,14 +225,14 @@ struct qede_fastpath {\n  */\n int qede_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \t\t\tuint16_t nb_desc, unsigned int socket_id,\n-\t\t\tconst struct rte_eth_rxconf *rx_conf,\n+\t\t\tconst struct rte_eth_rxq_conf *rx_conf,\n \t\t\tstruct rte_mempool *mp);\n \n int qede_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\tuint16_t queue_idx,\n \t\t\tuint16_t nb_desc,\n \t\t\tunsigned int socket_id,\n-\t\t\tconst struct rte_eth_txconf *tx_conf);\n+\t\t\tconst struct rte_eth_txq_conf *tx_conf);\n \n void qede_rx_queue_release(void *rx_queue);\n \ndiff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c\nindex 464d3d384..6d077e3cf 100644\n--- a/drivers/net/ring/rte_eth_ring.c\n+++ b/drivers/net/ring/rte_eth_ring.c\n@@ -155,11 +155,12 @@ eth_dev_set_link_up(struct rte_eth_dev *dev)\n }\n \n static int\n-eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n-\t\t\t\t    uint16_t nb_rx_desc __rte_unused,\n-\t\t\t\t    unsigned int socket_id __rte_unused,\n-\t\t\t\t    const struct rte_eth_rxconf *rx_conf __rte_unused,\n-\t\t\t\t    struct rte_mempool *mb_pool __rte_unused)\n+eth_rx_queue_setup(struct rte_eth_dev *dev,\n+\t\t   uint16_t rx_queue_id,\n+\t\t   uint16_t nb_rx_desc __rte_unused,\n+\t\t   unsigned int socket_id __rte_unused,\n+\t\t   const struct rte_eth_rxq_conf *rx_conf __rte_unused,\n+\t\t   struct rte_mempool *mb_pool __rte_unused)\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n \tdev->data->rx_queues[rx_queue_id] = &internals->rx_ring_queues[rx_queue_id];\n@@ -167,10 +168,11 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n }\n \n static int\n-eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n-\t\t\t\t    uint16_t nb_tx_desc __rte_unused,\n-\t\t\t\t    unsigned int socket_id __rte_unused,\n-\t\t\t\t    const struct rte_eth_txconf *tx_conf __rte_unused)\n+eth_tx_queue_setup(struct rte_eth_dev *dev,\n+\t\t   uint16_t tx_queue_id,\n+\t\t   uint16_t nb_tx_desc __rte_unused,\n+\t\t   unsigned int socket_id __rte_unused,\n+\t\t   const struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n \tdev->data->tx_queues[tx_queue_id] = &internals->tx_ring_queues[tx_queue_id];\ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex 2b037d863..959a2b42f 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -404,7 +404,7 @@ sfc_dev_allmulti_disable(struct rte_eth_dev *dev)\n static int\n sfc_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n \t\t   uint16_t nb_rx_desc, unsigned int socket_id,\n-\t\t   const struct rte_eth_rxconf *rx_conf,\n+\t\t   const struct rte_eth_rxq_conf *rx_conf,\n \t\t   struct rte_mempool *mb_pool)\n {\n \tstruct sfc_adapter *sa = dev->data->dev_private;\n@@ -461,7 +461,7 @@ sfc_rx_queue_release(void *queue)\n static int\n sfc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n \t\t   uint16_t nb_tx_desc, unsigned int socket_id,\n-\t\t   const struct rte_eth_txconf *tx_conf)\n+\t\t   const struct rte_eth_txq_conf *tx_conf)\n {\n \tstruct sfc_adapter *sa = dev->data->dev_private;\n \tint rc;\ndiff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c\nindex 79ed046ce..079df6272 100644\n--- a/drivers/net/sfc/sfc_rx.c\n+++ b/drivers/net/sfc/sfc_rx.c\n@@ -772,7 +772,7 @@ sfc_rx_qstop(struct sfc_adapter *sa, unsigned int sw_index)\n \n static int\n sfc_rx_qcheck_conf(struct sfc_adapter *sa, uint16_t nb_rx_desc,\n-\t\t   const struct rte_eth_rxconf *rx_conf)\n+\t\t   const struct rte_eth_rxq_conf *rx_conf)\n {\n \tconst uint16_t rx_free_thresh_max = EFX_RXQ_LIMIT(nb_rx_desc);\n \tint rc = 0;\n@@ -903,7 +903,7 @@ sfc_rx_mb_pool_buf_size(struct sfc_adapter *sa, struct rte_mempool *mb_pool)\n int\n sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \t     uint16_t nb_rx_desc, unsigned int socket_id,\n-\t     const struct rte_eth_rxconf *rx_conf,\n+\t     const struct rte_eth_rxq_conf *rx_conf,\n \t     struct rte_mempool *mb_pool)\n {\n \tconst efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);\ndiff --git a/drivers/net/sfc/sfc_rx.h b/drivers/net/sfc/sfc_rx.h\nindex 9e6282ead..126c41089 100644\n--- a/drivers/net/sfc/sfc_rx.h\n+++ b/drivers/net/sfc/sfc_rx.h\n@@ -156,7 +156,7 @@ void sfc_rx_stop(struct sfc_adapter *sa);\n \n int sfc_rx_qinit(struct sfc_adapter *sa, unsigned int rx_queue_id,\n \t\t uint16_t nb_rx_desc, unsigned int socket_id,\n-\t\t const struct rte_eth_rxconf *rx_conf,\n+\t\t const struct rte_eth_rxq_conf *rx_conf,\n \t\t struct rte_mempool *mb_pool);\n void sfc_rx_qfini(struct sfc_adapter *sa, unsigned int sw_index);\n int sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index);\ndiff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c\nindex bf596017a..fe030baa4 100644\n--- a/drivers/net/sfc/sfc_tx.c\n+++ b/drivers/net/sfc/sfc_tx.c\n@@ -58,7 +58,7 @@\n \n static int\n sfc_tx_qcheck_conf(struct sfc_adapter *sa, uint16_t nb_tx_desc,\n-\t\t   const struct rte_eth_txconf *tx_conf)\n+\t\t   const struct rte_eth_txq_conf *tx_conf)\n {\n \tunsigned int flags = tx_conf->txq_flags;\n \tconst efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);\n@@ -128,7 +128,7 @@ sfc_tx_qflush_done(struct sfc_txq *txq)\n int\n sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \t     uint16_t nb_tx_desc, unsigned int socket_id,\n-\t     const struct rte_eth_txconf *tx_conf)\n+\t     const struct rte_eth_txq_conf *tx_conf)\n {\n \tconst efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);\n \tstruct sfc_txq_info *txq_info;\ndiff --git a/drivers/net/sfc/sfc_tx.h b/drivers/net/sfc/sfc_tx.h\nindex 0c1c7083b..90b5eb7d7 100644\n--- a/drivers/net/sfc/sfc_tx.h\n+++ b/drivers/net/sfc/sfc_tx.h\n@@ -141,7 +141,7 @@ void sfc_tx_close(struct sfc_adapter *sa);\n \n int sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \t\t uint16_t nb_tx_desc, unsigned int socket_id,\n-\t\t const struct rte_eth_txconf *tx_conf);\n+\t\t const struct rte_eth_txq_conf *tx_conf);\n void sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index);\n \n void sfc_tx_qflush_done(struct sfc_txq *txq);\ndiff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c\nindex 9c0d57cc1..6ba24a263 100644\n--- a/drivers/net/szedata2/rte_eth_szedata2.c\n+++ b/drivers/net/szedata2/rte_eth_szedata2.c\n@@ -1253,7 +1253,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,\n \t\tuint16_t rx_queue_id,\n \t\tuint16_t nb_rx_desc __rte_unused,\n \t\tunsigned int socket_id __rte_unused,\n-\t\tconst struct rte_eth_rxconf *rx_conf __rte_unused,\n+\t\tconst struct rte_eth_rxq_conf *rx_conf __rte_unused,\n \t\tstruct rte_mempool *mb_pool)\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n@@ -1287,7 +1287,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev,\n \t\tuint16_t tx_queue_id,\n \t\tuint16_t nb_tx_desc __rte_unused,\n \t\tunsigned int socket_id __rte_unused,\n-\t\tconst struct rte_eth_txconf *tx_conf __rte_unused)\n+\t\tconst struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n \tstruct szedata2_tx_queue *txq = &internals->tx_queue[tx_queue_id];\ndiff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c\nindex 9acea8398..5a1125a7a 100644\n--- a/drivers/net/tap/rte_eth_tap.c\n+++ b/drivers/net/tap/rte_eth_tap.c\n@@ -918,7 +918,7 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t   uint16_t rx_queue_id,\n \t\t   uint16_t nb_rx_desc,\n \t\t   unsigned int socket_id,\n-\t\t   const struct rte_eth_rxconf *rx_conf __rte_unused,\n+\t\t   const struct rte_eth_rxq_conf *rx_conf __rte_unused,\n \t\t   struct rte_mempool *mp)\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n@@ -997,7 +997,7 @@ tap_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t   uint16_t tx_queue_id,\n \t\t   uint16_t nb_tx_desc __rte_unused,\n \t\t   unsigned int socket_id __rte_unused,\n-\t\t   const struct rte_eth_txconf *tx_conf __rte_unused)\n+\t\t   const struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n \tint ret;\ndiff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c\nindex edc17f1d4..3ddca8b49 100644\n--- a/drivers/net/thunderx/nicvf_ethdev.c\n+++ b/drivers/net/thunderx/nicvf_ethdev.c\n@@ -936,7 +936,7 @@ nicvf_set_rx_function(struct rte_eth_dev *dev)\n static int\n nicvf_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,\n \t\t\t uint16_t nb_desc, unsigned int socket_id,\n-\t\t\t const struct rte_eth_txconf *tx_conf)\n+\t\t\t const struct rte_eth_txq_conf *tx_conf)\n {\n \tuint16_t tx_free_thresh;\n \tuint8_t is_single_pool;\n@@ -1261,7 +1261,7 @@ nicvf_rxq_mbuf_setup(struct nicvf_rxq *rxq)\n static int\n nicvf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,\n \t\t\t uint16_t nb_desc, unsigned int socket_id,\n-\t\t\t const struct rte_eth_rxconf *rx_conf,\n+\t\t\t const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t struct rte_mempool *mp)\n {\n \tuint16_t rx_free_thresh;\n@@ -1403,12 +1403,12 @@ nicvf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \tif (nicvf_hw_cap(nic) & NICVF_CAP_TUNNEL_PARSING)\n \t\tdev_info->flow_type_rss_offloads |= NICVF_RSS_OFFLOAD_TUNNEL;\n \n-\tdev_info->default_rxconf = (struct rte_eth_rxconf) {\n+\tdev_info->default_rxconf = (struct rte_eth_rxq_conf) {\n \t\t.rx_free_thresh = NICVF_DEFAULT_RX_FREE_THRESH,\n \t\t.rx_drop_en = 0,\n \t};\n \n-\tdev_info->default_txconf = (struct rte_eth_txconf) {\n+\tdev_info->default_txconf = (struct rte_eth_txq_conf) {\n \t\t.tx_free_thresh = NICVF_DEFAULT_TX_FREE_THRESH,\n \t\t.txq_flags =\n \t\t\tETH_TXQ_FLAGS_NOMULTSEGS  |\ndiff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c\nindex 0dac5e60e..c90d06bd7 100644\n--- a/drivers/net/vhost/rte_eth_vhost.c\n+++ b/drivers/net/vhost/rte_eth_vhost.c\n@@ -831,7 +831,7 @@ static int\n eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n \t\t   uint16_t nb_rx_desc __rte_unused,\n \t\t   unsigned int socket_id,\n-\t\t   const struct rte_eth_rxconf *rx_conf __rte_unused,\n+\t\t   const struct rte_eth_rxq_conf *rx_conf __rte_unused,\n \t\t   struct rte_mempool *mb_pool)\n {\n \tstruct vhost_queue *vq;\n@@ -854,7 +854,7 @@ static int\n eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n \t\t   uint16_t nb_tx_desc __rte_unused,\n \t\t   unsigned int socket_id,\n-\t\t   const struct rte_eth_txconf *tx_conf __rte_unused)\n+\t\t   const struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \tstruct vhost_queue *vq;\n \ndiff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex e320811ed..763b30e9a 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -1891,7 +1891,7 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \tdev_info->min_rx_bufsize = VIRTIO_MIN_RX_BUFSIZE;\n \tdev_info->max_rx_pktlen = VIRTIO_MAX_RX_PKTLEN;\n \tdev_info->max_mac_addrs = VIRTIO_MAX_MAC_ADDRS;\n-\tdev_info->default_txconf = (struct rte_eth_txconf) {\n+\tdev_info->default_txconf = (struct rte_eth_txq_conf) {\n \t\t.txq_flags = ETH_TXQ_FLAGS_NOOFFLOADS\n \t};\n \ndiff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h\nindex c3413c6d9..57f0d7ad2 100644\n--- a/drivers/net/virtio/virtio_ethdev.h\n+++ b/drivers/net/virtio/virtio_ethdev.h\n@@ -89,12 +89,12 @@ int virtio_dev_rx_queue_done(void *rxq, uint16_t offset);\n \n int  virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n \t\tuint16_t nb_rx_desc, unsigned int socket_id,\n-\t\tconst struct rte_eth_rxconf *rx_conf,\n+\t\tconst struct rte_eth_rxq_conf *rx_conf,\n \t\tstruct rte_mempool *mb_pool);\n \n int  virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n \t\tuint16_t nb_tx_desc, unsigned int socket_id,\n-\t\tconst struct rte_eth_txconf *tx_conf);\n+\t\tconst struct rte_eth_txq_conf *tx_conf);\n \n uint16_t virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\tuint16_t nb_pkts);\ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex e30377c51..cff1d9b62 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -414,7 +414,7 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\tuint16_t queue_idx,\n \t\t\tuint16_t nb_desc,\n \t\t\tunsigned int socket_id __rte_unused,\n-\t\t\t__rte_unused const struct rte_eth_rxconf *rx_conf,\n+\t\t\t__rte_unused const struct rte_eth_rxq_conf *rx_conf,\n \t\t\tstruct rte_mempool *mp)\n {\n \tuint16_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_RQ_QUEUE_IDX;\n@@ -492,7 +492,7 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \n static void\n virtio_update_rxtx_handler(struct rte_eth_dev *dev,\n-\t\t\t   const struct rte_eth_txconf *tx_conf)\n+\t\t\t   const struct rte_eth_txq_conf *tx_conf)\n {\n \tuint8_t use_simple_rxtx = 0;\n \tstruct virtio_hw *hw = dev->data->dev_private;\n@@ -519,7 +519,7 @@ virtio_update_rxtx_handler(struct rte_eth_dev *dev,\n  * struct rte_eth_dev *dev: Used to update dev\n  * uint16_t nb_desc: Defaults to values read from config space\n  * unsigned int socket_id: Used to allocate memzone\n- * const struct rte_eth_txconf *tx_conf: Used to setup tx engine\n+ * const struct rte_eth_txq_conf *tx_conf: Used to setup tx engine\n  * uint16_t queue_idx: Just used as an index in dev txq list\n  */\n int\n@@ -527,7 +527,7 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\tuint16_t queue_idx,\n \t\t\tuint16_t nb_desc,\n \t\t\tunsigned int socket_id __rte_unused,\n-\t\t\tconst struct rte_eth_txconf *tx_conf)\n+\t\t\tconst struct rte_eth_txq_conf *tx_conf)\n {\n \tuint8_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX;\n \tstruct virtio_hw *hw = dev->data->dev_private;\ndiff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h\nindex b48058afc..98389fa74 100644\n--- a/drivers/net/vmxnet3/vmxnet3_ethdev.h\n+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h\n@@ -189,11 +189,11 @@ void vmxnet3_dev_tx_queue_release(void *txq);\n \n int  vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n \t\t\t\tuint16_t nb_rx_desc, unsigned int socket_id,\n-\t\t\t\tconst struct rte_eth_rxconf *rx_conf,\n+\t\t\t\tconst struct rte_eth_rxq_conf *rx_conf,\n \t\t\t\tstruct rte_mempool *mb_pool);\n int  vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n \t\t\t\tuint16_t nb_tx_desc, unsigned int socket_id,\n-\t\t\t\tconst struct rte_eth_txconf *tx_conf);\n+\t\t\t\tconst struct rte_eth_txq_conf *tx_conf);\n \n int vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev);\n \ndiff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c\nindex d9cf43739..cfdf72f7f 100644\n--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c\n+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c\n@@ -888,7 +888,7 @@ vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t   uint16_t queue_idx,\n \t\t\t   uint16_t nb_desc,\n \t\t\t   unsigned int socket_id,\n-\t\t\t   const struct rte_eth_txconf *tx_conf)\n+\t\t\t   const struct rte_eth_txq_conf *tx_conf)\n {\n \tstruct vmxnet3_hw *hw = dev->data->dev_private;\n \tconst struct rte_memzone *mz;\n@@ -993,7 +993,7 @@ vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t   uint16_t queue_idx,\n \t\t\t   uint16_t nb_desc,\n \t\t\t   unsigned int socket_id,\n-\t\t\t   __rte_unused const struct rte_eth_rxconf *rx_conf,\n+\t\t\t   __rte_unused const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t   struct rte_mempool *mp)\n {\n \tconst struct rte_memzone *mz;\ndiff --git a/drivers/net/xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c\nindex e404b7755..792fbfb0a 100644\n--- a/drivers/net/xenvirt/rte_eth_xenvirt.c\n+++ b/drivers/net/xenvirt/rte_eth_xenvirt.c\n@@ -492,11 +492,12 @@ virtio_queue_setup(struct rte_eth_dev *dev, int queue_type)\n }\n \n static int\n-eth_rx_queue_setup(struct rte_eth_dev *dev,uint16_t rx_queue_id,\n-\t\t\t\tuint16_t nb_rx_desc __rte_unused,\n-\t\t\t\tunsigned int socket_id __rte_unused,\n-\t\t\t\tconst struct rte_eth_rxconf *rx_conf __rte_unused,\n-\t\t\t\tstruct rte_mempool *mb_pool)\n+eth_rx_queue_setup(struct rte_eth_dev *dev,\n+\t\t   uint16_t rx_queue_id,\n+\t\t   uint16_t nb_rx_desc __rte_unused,\n+\t\t   unsigned int socket_id __rte_unused,\n+\t\t   const struct rte_eth_rxq_conf *rx_conf __rte_unused,\n+\t\t   struct rte_mempool *mb_pool)\n {\n \tstruct virtqueue *vq;\n \tvq = dev->data->rx_queues[rx_queue_id] = virtio_queue_setup(dev, VTNET_RQ);\n@@ -505,10 +506,11 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,uint16_t rx_queue_id,\n }\n \n static int\n-eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n-\t\t\t\tuint16_t nb_tx_desc __rte_unused,\n-\t\t\t\tunsigned int socket_id __rte_unused,\n-\t\t\t\tconst struct rte_eth_txconf *tx_conf __rte_unused)\n+eth_tx_queue_setup(struct rte_eth_dev *dev,\n+\t\t   uint16_t tx_queue_id,\n+\t\t   uint16_t nb_tx_desc __rte_unused,\n+\t\t   unsigned int socket_id __rte_unused,\n+\t\t   const struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \tdev->data->tx_queues[tx_queue_id] = virtio_queue_setup(dev, VTNET_TQ);\n \treturn 0;\ndiff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c\nindex 8c0e17911..15f9426f2 100644\n--- a/examples/ip_fragmentation/main.c\n+++ b/examples/ip_fragmentation/main.c\n@@ -869,7 +869,7 @@ main(int argc, char **argv)\n {\n \tstruct lcore_queue_conf *qconf;\n \tstruct rte_eth_dev_info dev_info;\n-\tstruct rte_eth_txconf *txconf;\n+\tstruct rte_eth_txq_conf *txconf;\n \tstruct rx_queue *rxq;\n \tint socket, ret;\n \tunsigned nb_ports;\ndiff --git a/examples/ip_pipeline/app.h b/examples/ip_pipeline/app.h\nindex e41290e74..59bb1bac8 100644\n--- a/examples/ip_pipeline/app.h\n+++ b/examples/ip_pipeline/app.h\n@@ -103,7 +103,7 @@ struct app_pktq_hwq_in_params {\n \tuint32_t size;\n \tuint32_t burst;\n \n-\tstruct rte_eth_rxconf conf;\n+\tstruct rte_eth_rxq_conf conf;\n };\n \n struct app_pktq_hwq_out_params {\n@@ -113,7 +113,7 @@ struct app_pktq_hwq_out_params {\n \tuint32_t burst;\n \tuint32_t dropless;\n \tuint64_t n_retries;\n-\tstruct rte_eth_txconf conf;\n+\tstruct rte_eth_txq_conf conf;\n };\n \n struct app_pktq_swq_params {\ndiff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c\nindex e62636cb4..746140f60 100644\n--- a/examples/ip_reassembly/main.c\n+++ b/examples/ip_reassembly/main.c\n@@ -1017,7 +1017,7 @@ main(int argc, char **argv)\n {\n \tstruct lcore_queue_conf *qconf;\n \tstruct rte_eth_dev_info dev_info;\n-\tstruct rte_eth_txconf *txconf;\n+\tstruct rte_eth_txq_conf *txconf;\n \tstruct rx_queue *rxq;\n \tint ret, socket;\n \tunsigned nb_ports;\ndiff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c\nindex 99dc270cb..807d079cf 100644\n--- a/examples/ipsec-secgw/ipsec-secgw.c\n+++ b/examples/ipsec-secgw/ipsec-secgw.c\n@@ -1325,7 +1325,7 @@ static void\n port_init(uint8_t portid)\n {\n \tstruct rte_eth_dev_info dev_info;\n-\tstruct rte_eth_txconf *txconf;\n+\tstruct rte_eth_txq_conf *txconf;\n \tuint16_t nb_tx_queue, nb_rx_queue;\n \tuint16_t tx_queueid, rx_queueid, queue, lcore_id;\n \tint32_t ret, socket_id;\ndiff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c\nindex 9a13d3530..a3c060778 100644\n--- a/examples/ipv4_multicast/main.c\n+++ b/examples/ipv4_multicast/main.c\n@@ -668,7 +668,7 @@ main(int argc, char **argv)\n {\n \tstruct lcore_queue_conf *qconf;\n \tstruct rte_eth_dev_info dev_info;\n-\tstruct rte_eth_txconf *txconf;\n+\tstruct rte_eth_txq_conf *txconf;\n \tint ret;\n \tuint16_t queueid;\n \tunsigned lcore_id = 0, rx_lcore_id = 0;\ndiff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c\nindex 8eff4de41..03124e142 100644\n--- a/examples/l3fwd-acl/main.c\n+++ b/examples/l3fwd-acl/main.c\n@@ -1887,7 +1887,7 @@ main(int argc, char **argv)\n {\n \tstruct lcore_conf *qconf;\n \tstruct rte_eth_dev_info dev_info;\n-\tstruct rte_eth_txconf *txconf;\n+\tstruct rte_eth_txq_conf *txconf;\n \tint ret;\n \tunsigned nb_ports;\n \tuint16_t queueid;\ndiff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c\nindex fd442f5ef..f54decd20 100644\n--- a/examples/l3fwd-power/main.c\n+++ b/examples/l3fwd-power/main.c\n@@ -1643,7 +1643,7 @@ main(int argc, char **argv)\n {\n \tstruct lcore_conf *qconf;\n \tstruct rte_eth_dev_info dev_info;\n-\tstruct rte_eth_txconf *txconf;\n+\tstruct rte_eth_txq_conf *txconf;\n \tint ret;\n \tunsigned nb_ports;\n \tuint16_t queueid;\ndiff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c\nindex 34e4a6bef..9a1ff8748 100644\n--- a/examples/l3fwd-vf/main.c\n+++ b/examples/l3fwd-vf/main.c\n@@ -950,7 +950,7 @@ main(int argc, char **argv)\n {\n \tstruct lcore_conf *qconf;\n \tstruct rte_eth_dev_info dev_info;\n-\tstruct rte_eth_txconf *txconf;\n+\tstruct rte_eth_txq_conf *txconf;\n \tint ret;\n \tunsigned nb_ports;\n \tuint16_t queueid;\ndiff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c\nindex 81995fdbe..2e904b7ae 100644\n--- a/examples/l3fwd/main.c\n+++ b/examples/l3fwd/main.c\n@@ -844,7 +844,7 @@ main(int argc, char **argv)\n {\n \tstruct lcore_conf *qconf;\n \tstruct rte_eth_dev_info dev_info;\n-\tstruct rte_eth_txconf *txconf;\n+\tstruct rte_eth_txq_conf *txconf;\n \tint ret;\n \tunsigned nb_ports;\n \tuint16_t queueid;\ndiff --git a/examples/netmap_compat/lib/compat_netmap.c b/examples/netmap_compat/lib/compat_netmap.c\nindex af2d9f3f7..2c245d1df 100644\n--- a/examples/netmap_compat/lib/compat_netmap.c\n+++ b/examples/netmap_compat/lib/compat_netmap.c\n@@ -57,8 +57,8 @@ struct netmap_port {\n \tstruct rte_mempool   *pool;\n \tstruct netmap_if     *nmif;\n \tstruct rte_eth_conf   eth_conf;\n-\tstruct rte_eth_txconf tx_conf;\n-\tstruct rte_eth_rxconf rx_conf;\n+\tstruct rte_eth_txq_conf tx_conf;\n+\tstruct rte_eth_rxq_conf rx_conf;\n \tint32_t  socket_id;\n \tuint16_t nr_tx_rings;\n \tuint16_t nr_rx_rings;\ndiff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c\nindex 7954b9744..e72b86e78 100644\n--- a/examples/performance-thread/l3fwd-thread/main.c\n+++ b/examples/performance-thread/l3fwd-thread/main.c\n@@ -3493,7 +3493,7 @@ int\n main(int argc, char **argv)\n {\n \tstruct rte_eth_dev_info dev_info;\n-\tstruct rte_eth_txconf *txconf;\n+\tstruct rte_eth_txq_conf *txconf;\n \tint ret;\n \tint i;\n \tunsigned nb_ports;\ndiff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c\nindex ddfcdb832..ac350f5fb 100644\n--- a/examples/ptpclient/ptpclient.c\n+++ b/examples/ptpclient/ptpclient.c\n@@ -237,7 +237,7 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool)\n \t/* Allocate and set up 1 TX queue per Ethernet port. */\n \tfor (q = 0; q < tx_rings; q++) {\n \t\t/* Setup txq_flags */\n-\t\tstruct rte_eth_txconf *txconf;\n+\t\tstruct rte_eth_txq_conf *txconf;\n \n \t\trte_eth_dev_info_get(q, &dev_info);\n \t\ttxconf = &dev_info.default_txconf;\ndiff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c\nindex a82cbd7d5..955d051d2 100644\n--- a/examples/qos_sched/init.c\n+++ b/examples/qos_sched/init.c\n@@ -104,8 +104,8 @@ app_init_port(uint8_t portid, struct rte_mempool *mp)\n {\n \tint ret;\n \tstruct rte_eth_link link;\n-\tstruct rte_eth_rxconf rx_conf;\n-\tstruct rte_eth_txconf tx_conf;\n+\tstruct rte_eth_rxq_conf rx_conf;\n+\tstruct rte_eth_txq_conf tx_conf;\n \tuint16_t rx_size;\n \tuint16_t tx_size;\n \ndiff --git a/examples/tep_termination/vxlan_setup.c b/examples/tep_termination/vxlan_setup.c\nindex 050bb32d3..8d61e8891 100644\n--- a/examples/tep_termination/vxlan_setup.c\n+++ b/examples/tep_termination/vxlan_setup.c\n@@ -138,8 +138,8 @@ vxlan_port_init(uint8_t port, struct rte_mempool *mbuf_pool)\n \tuint16_t rx_ring_size = RTE_TEST_RX_DESC_DEFAULT;\n \tuint16_t tx_ring_size = RTE_TEST_TX_DESC_DEFAULT;\n \tstruct rte_eth_udp_tunnel tunnel_udp;\n-\tstruct rte_eth_rxconf *rxconf;\n-\tstruct rte_eth_txconf *txconf;\n+\tstruct rte_eth_rxq_conf *rxconf;\n+\tstruct rte_eth_txq_conf *txconf;\n \tstruct vxlan_conf *pconf = &vxdev;\n \n \tpconf->dst_port = udp_port;\ndiff --git a/examples/vhost/main.c b/examples/vhost/main.c\nindex 4d1589d06..75c4c8341 100644\n--- a/examples/vhost/main.c\n+++ b/examples/vhost/main.c\n@@ -269,8 +269,8 @@ port_init(uint8_t port)\n {\n \tstruct rte_eth_dev_info dev_info;\n \tstruct rte_eth_conf port_conf;\n-\tstruct rte_eth_rxconf *rxconf;\n-\tstruct rte_eth_txconf *txconf;\n+\tstruct rte_eth_rxq_conf *rxconf;\n+\tstruct rte_eth_txq_conf *txconf;\n \tint16_t rx_rings, tx_rings;\n \tuint16_t rx_ring_size, tx_ring_size;\n \tint retval;\ndiff --git a/examples/vhost_xen/main.c b/examples/vhost_xen/main.c\nindex eba4d35aa..852269cdc 100644\n--- a/examples/vhost_xen/main.c\n+++ b/examples/vhost_xen/main.c\n@@ -276,7 +276,7 @@ static inline int\n port_init(uint8_t port, struct rte_mempool *mbuf_pool)\n {\n \tstruct rte_eth_dev_info dev_info;\n-\tstruct rte_eth_rxconf *rxconf;\n+\tstruct rte_eth_rxq_conf *rxconf;\n \tstruct rte_eth_conf port_conf;\n \tuint16_t rx_rings, tx_rings = (uint16_t)rte_lcore_count();\n \tuint16_t rx_ring_size = RTE_TEST_RX_DESC_DEFAULT;\ndiff --git a/examples/vmdq/main.c b/examples/vmdq/main.c\nindex 8949a1156..5c3a73789 100644\n--- a/examples/vmdq/main.c\n+++ b/examples/vmdq/main.c\n@@ -189,7 +189,7 @@ static inline int\n port_init(uint8_t port, struct rte_mempool *mbuf_pool)\n {\n \tstruct rte_eth_dev_info dev_info;\n-\tstruct rte_eth_rxconf *rxconf;\n+\tstruct rte_eth_rxq_conf *rxconf;\n \tstruct rte_eth_conf port_conf;\n \tuint16_t rxRings, txRings;\n \tuint16_t rxRingSize = RTE_TEST_RX_DESC_DEFAULT;\ndiff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c\nindex 0597641ee..da2424cc4 100644\n--- a/lib/librte_ether/rte_ethdev.c\n+++ b/lib/librte_ether/rte_ethdev.c\n@@ -997,7 +997,7 @@ rte_eth_dev_close(uint8_t port_id)\n int\n rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,\n \t\t       uint16_t nb_rx_desc, unsigned int socket_id,\n-\t\t       const struct rte_eth_rxconf *rx_conf,\n+\t\t       const struct rte_eth_rxq_conf *rx_conf,\n \t\t       struct rte_mempool *mp)\n {\n \tint ret;\n@@ -1088,7 +1088,7 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,\n int\n rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,\n \t\t       uint16_t nb_tx_desc, unsigned int socket_id,\n-\t\t       const struct rte_eth_txconf *tx_conf)\n+\t\t       const struct rte_eth_txq_conf *tx_conf)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct rte_eth_dev_info dev_info;\ndiff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h\nindex 0adf3274a..c40db4ee0 100644\n--- a/lib/librte_ether/rte_ethdev.h\n+++ b/lib/librte_ether/rte_ethdev.h\n@@ -686,7 +686,7 @@ struct rte_eth_txmode {\n /**\n  * A structure used to configure an RX ring of an Ethernet port.\n  */\n-struct rte_eth_rxconf {\n+struct rte_eth_rxq_conf {\n \tstruct rte_eth_thresh rx_thresh; /**< RX ring threshold registers. */\n \tuint16_t rx_free_thresh; /**< Drives the freeing of RX descriptors. */\n \tuint8_t rx_drop_en; /**< Drop packets if no descriptors are available. */\n@@ -709,7 +709,7 @@ struct rte_eth_rxconf {\n /**\n  * A structure used to configure a TX ring of an Ethernet port.\n  */\n-struct rte_eth_txconf {\n+struct rte_eth_txq_conf {\n \tstruct rte_eth_thresh tx_thresh; /**< TX ring threshold registers. */\n \tuint16_t tx_rs_thresh; /**< Drives the setting of RS bit on TXDs. */\n \tuint16_t tx_free_thresh; /**< Start freeing TX buffers if there are\n@@ -956,8 +956,10 @@ struct rte_eth_dev_info {\n \tuint8_t hash_key_size; /**< Hash key size in bytes */\n \t/** Bit mask of RSS offloads, the bit offset also means flow type */\n \tuint64_t flow_type_rss_offloads;\n-\tstruct rte_eth_rxconf default_rxconf; /**< Default RX configuration */\n-\tstruct rte_eth_txconf default_txconf; /**< Default TX configuration */\n+\tstruct rte_eth_rxq_conf default_rxconf;\n+\t/**< Default RX queue configuration */\n+\tstruct rte_eth_txq_conf default_txconf;\n+\t/**< Default TX queue configuration */\n \tuint16_t vmdq_queue_base; /**< First queue ID for VMDQ pools. */\n \tuint16_t vmdq_queue_num;  /**< Queue number for VMDQ pools. */\n \tuint16_t vmdq_pool_base;  /**< First ID of VMDQ pools. */\n@@ -975,7 +977,7 @@ struct rte_eth_dev_info {\n  */\n struct rte_eth_rxq_info {\n \tstruct rte_mempool *mp;     /**< mempool used by that queue. */\n-\tstruct rte_eth_rxconf conf; /**< queue config parameters. */\n+\tstruct rte_eth_rxq_conf conf; /**< queue config parameters. */\n \tuint8_t scattered_rx;       /**< scattered packets RX supported. */\n \tuint16_t nb_desc;           /**< configured number of RXDs. */\n } __rte_cache_min_aligned;\n@@ -985,7 +987,7 @@ struct rte_eth_rxq_info {\n  * Used to retieve information about configured queue.\n  */\n struct rte_eth_txq_info {\n-\tstruct rte_eth_txconf conf; /**< queue config parameters. */\n+\tstruct rte_eth_txq_conf conf; /**< queue config parameters. */\n \tuint16_t nb_desc;           /**< configured number of TXDs. */\n } __rte_cache_min_aligned;\n \n@@ -1185,7 +1187,7 @@ typedef int (*eth_rx_queue_setup_t)(struct rte_eth_dev *dev,\n \t\t\t\t    uint16_t rx_queue_id,\n \t\t\t\t    uint16_t nb_rx_desc,\n \t\t\t\t    unsigned int socket_id,\n-\t\t\t\t    const struct rte_eth_rxconf *rx_conf,\n+\t\t\t\t    const struct rte_eth_rxq_conf *rx_conf,\n \t\t\t\t    struct rte_mempool *mb_pool);\n /**< @internal Set up a receive queue of an Ethernet device. */\n \n@@ -1193,7 +1195,7 @@ typedef int (*eth_tx_queue_setup_t)(struct rte_eth_dev *dev,\n \t\t\t\t    uint16_t tx_queue_id,\n \t\t\t\t    uint16_t nb_tx_desc,\n \t\t\t\t    unsigned int socket_id,\n-\t\t\t\t    const struct rte_eth_txconf *tx_conf);\n+\t\t\t\t    const struct rte_eth_txq_conf *tx_conf);\n /**< @internal Setup a transmit queue of an Ethernet device. */\n \n typedef int (*eth_rx_enable_intr_t)(struct rte_eth_dev *dev,\n@@ -1937,7 +1939,7 @@ void _rte_eth_dev_reset(struct rte_eth_dev *dev);\n  */\n int rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,\n \t\tuint16_t nb_rx_desc, unsigned int socket_id,\n-\t\tconst struct rte_eth_rxconf *rx_conf,\n+\t\tconst struct rte_eth_rxq_conf *rx_conf,\n \t\tstruct rte_mempool *mb_pool);\n \n /**\n@@ -1985,7 +1987,7 @@ int rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,\n  */\n int rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,\n \t\tuint16_t nb_tx_desc, unsigned int socket_id,\n-\t\tconst struct rte_eth_txconf *tx_conf);\n+\t\tconst struct rte_eth_txq_conf *tx_conf);\n \n /**\n  * Return the NUMA socket to which an Ethernet device is connected\n@@ -2972,7 +2974,7 @@ static inline int rte_eth_tx_descriptor_status(uint8_t port_id,\n  *\n  * If the PMD is DEV_TX_OFFLOAD_MT_LOCKFREE capable, multiple threads can\n  * invoke this function concurrently on the same tx queue without SW lock.\n- * @see rte_eth_dev_info_get, struct rte_eth_txconf::txq_flags\n+ * @see rte_eth_dev_info_get, struct rte_eth_txq_conf::txq_flags\n  *\n  * @param port_id\n  *   The port identifier of the Ethernet device.\ndiff --git a/test/test-pipeline/init.c b/test/test-pipeline/init.c\nindex 1457c7890..eee75fb0e 100644\n--- a/test/test-pipeline/init.c\n+++ b/test/test-pipeline/init.c\n@@ -117,7 +117,7 @@ static struct rte_eth_conf port_conf = {\n \t},\n };\n \n-static struct rte_eth_rxconf rx_conf = {\n+static struct rte_eth_rxq_conf rx_conf = {\n \t.rx_thresh = {\n \t\t.pthresh = 8,\n \t\t.hthresh = 8,\n@@ -127,7 +127,7 @@ static struct rte_eth_rxconf rx_conf = {\n \t.rx_drop_en = 0,\n };\n \n-static struct rte_eth_txconf tx_conf = {\n+static struct rte_eth_txq_conf tx_conf = {\n \t.tx_thresh = {\n \t\t.pthresh = 36,\n \t\t.hthresh = 0,\ndiff --git a/test/test/test_kni.c b/test/test/test_kni.c\nindex db17fdf30..b5445e167 100644\n--- a/test/test/test_kni.c\n+++ b/test/test/test_kni.c\n@@ -67,7 +67,7 @@ struct test_kni_stats {\n \tvolatile uint64_t egress;\n };\n \n-static const struct rte_eth_rxconf rx_conf = {\n+static const struct rte_eth_rxq_conf rx_conf = {\n \t.rx_thresh = {\n \t\t.pthresh = 8,\n \t\t.hthresh = 8,\n@@ -76,7 +76,7 @@ static const struct rte_eth_rxconf rx_conf = {\n \t.rx_free_thresh = 0,\n };\n \n-static const struct rte_eth_txconf tx_conf = {\n+static const struct rte_eth_txq_conf tx_conf = {\n \t.tx_thresh = {\n \t\t.pthresh = 36,\n \t\t.hthresh = 0,\ndiff --git a/test/test/test_link_bonding.c b/test/test/test_link_bonding.c\nindex dc28cea59..af23b1ae1 100644\n--- a/test/test/test_link_bonding.c\n+++ b/test/test/test_link_bonding.c\n@@ -199,7 +199,7 @@ static struct rte_eth_conf default_pmd_conf = {\n \t.lpbk_mode = 0,\n };\n \n-static const struct rte_eth_rxconf rx_conf_default = {\n+static const struct rte_eth_rxq_conf rx_conf_default = {\n \t.rx_thresh = {\n \t\t.pthresh = RX_PTHRESH,\n \t\t.hthresh = RX_HTHRESH,\n@@ -209,7 +209,7 @@ static const struct rte_eth_rxconf rx_conf_default = {\n \t.rx_drop_en = 0,\n };\n \n-static struct rte_eth_txconf tx_conf_default = {\n+static struct rte_eth_txq_conf tx_conf_default = {\n \t.tx_thresh = {\n \t\t.pthresh = TX_PTHRESH,\n \t\t.hthresh = TX_HTHRESH,\ndiff --git a/test/test/test_pmd_perf.c b/test/test/test_pmd_perf.c\nindex 1ffd65a52..6f28ad303 100644\n--- a/test/test/test_pmd_perf.c\n+++ b/test/test/test_pmd_perf.c\n@@ -109,7 +109,7 @@ static struct rte_eth_conf port_conf = {\n \t.lpbk_mode = 1,  /* enable loopback */\n };\n \n-static struct rte_eth_rxconf rx_conf = {\n+static struct rte_eth_rxq_conf rx_conf = {\n \t.rx_thresh = {\n \t\t.pthresh = RX_PTHRESH,\n \t\t.hthresh = RX_HTHRESH,\n@@ -118,7 +118,7 @@ static struct rte_eth_rxconf rx_conf = {\n \t.rx_free_thresh = 32,\n };\n \n-static struct rte_eth_txconf tx_conf = {\n+static struct rte_eth_txq_conf tx_conf = {\n \t.tx_thresh = {\n \t\t.pthresh = TX_PTHRESH,\n \t\t.hthresh = TX_HTHRESH,\ndiff --git a/test/test/virtual_pmd.c b/test/test/virtual_pmd.c\nindex 9d46ad564..fb2479ced 100644\n--- a/test/test/virtual_pmd.c\n+++ b/test/test/virtual_pmd.c\n@@ -124,7 +124,7 @@ static int\n virtual_ethdev_rx_queue_setup_success(struct rte_eth_dev *dev,\n \t\tuint16_t rx_queue_id, uint16_t nb_rx_desc __rte_unused,\n \t\tunsigned int socket_id,\n-\t\tconst struct rte_eth_rxconf *rx_conf __rte_unused,\n+\t\tconst struct rte_eth_rxq_conf *rx_conf __rte_unused,\n \t\tstruct rte_mempool *mb_pool __rte_unused)\n {\n \tstruct virtual_ethdev_queue *rx_q;\n@@ -147,7 +147,7 @@ static int\n virtual_ethdev_rx_queue_setup_fail(struct rte_eth_dev *dev __rte_unused,\n \t\tuint16_t rx_queue_id __rte_unused, uint16_t nb_rx_desc __rte_unused,\n \t\tunsigned int socket_id __rte_unused,\n-\t\tconst struct rte_eth_rxconf *rx_conf __rte_unused,\n+\t\tconst struct rte_eth_rxq_conf *rx_conf __rte_unused,\n \t\tstruct rte_mempool *mb_pool __rte_unused)\n {\n \treturn -1;\n@@ -157,7 +157,7 @@ static int\n virtual_ethdev_tx_queue_setup_success(struct rte_eth_dev *dev,\n \t\tuint16_t tx_queue_id, uint16_t nb_tx_desc __rte_unused,\n \t\tunsigned int socket_id,\n-\t\tconst struct rte_eth_txconf *tx_conf __rte_unused)\n+\t\tconst struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \tstruct virtual_ethdev_queue *tx_q;\n \n@@ -179,7 +179,7 @@ static int\n virtual_ethdev_tx_queue_setup_fail(struct rte_eth_dev *dev __rte_unused,\n \t\tuint16_t tx_queue_id __rte_unused, uint16_t nb_tx_desc __rte_unused,\n \t\tunsigned int socket_id __rte_unused,\n-\t\tconst struct rte_eth_txconf *tx_conf __rte_unused)\n+\t\tconst struct rte_eth_txq_conf *tx_conf __rte_unused)\n {\n \treturn -1;\n }\n",
    "prefixes": [
        "dpdk-dev",
        "1/4"
    ]
}