Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/74434/?format=api
{ "id": 74434, "url": "http://patches.dpdk.org/api/patches/74434/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200719101816.16406-9-ophirmu@mellanox.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200719101816.16406-9-ophirmu@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200719101816.16406-9-ophirmu@mellanox.com", "date": "2020-07-19T10:18:16", "name": "[v3,8/8] mlx5: remove inclusion of Verbs header files", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "ebe431c327748ec66bf7affda09c68c185ecddfa", "submitter": { "id": 793, "url": "http://patches.dpdk.org/api/people/793/?format=api", "name": "Ophir Munk", "email": "ophirmu@mellanox.com" }, "delegate": { "id": 3268, "url": "http://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200719101816.16406-9-ophirmu@mellanox.com/mbox/", "series": [ { "id": 11146, "url": "http://patches.dpdk.org/api/series/11146/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=11146", "date": "2020-07-19T10:18:08", "name": "mlx5 PMD multi OS support - part #3", "version": 3, "mbox": "http://patches.dpdk.org/series/11146/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/74434/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/74434/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id E394AA0540;\n\tSun, 19 Jul 2020 12:19:52 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id B5A851C123;\n\tSun, 19 Jul 2020 12:18:42 +0200 (CEST)", "from EUR05-AM6-obe.outbound.protection.outlook.com\n (mail-am6eur05on2075.outbound.protection.outlook.com [40.107.22.75])\n by dpdk.org (Postfix) with ESMTP id 0B35A1C0C0\n for <dev@dpdk.org>; Sun, 19 Jul 2020 12:18:34 +0200 (CEST)", "from AM0PR05MB4209.eurprd05.prod.outlook.com (2603:10a6:208:61::22)\n by AM0PR05MB6324.eurprd05.prod.outlook.com (2603:10a6:208:143::14)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.25; Sun, 19 Jul\n 2020 10:18:33 +0000", "from AM0PR05MB4209.eurprd05.prod.outlook.com\n ([fe80::3949:70c3:126:3972]) by AM0PR05MB4209.eurprd05.prod.outlook.com\n ([fe80::3949:70c3:126:3972%7]) with mapi id 15.20.3195.024; Sun, 19 Jul 2020\n 10:18:32 +0000", "from mellanox.com (37.142.13.130) by\n AM0PR05CA0090.eurprd05.prod.outlook.com (2603:10a6:208:136::30) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.18 via Frontend\n Transport; Sun, 19 Jul 2020 10:18:31 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=I5p8IMVsl6OlqIUHGomH09oEn3IQcJJgphXQQjpL+5vPacAfGUeJRKHDvpQH61wS6Vc7TZ3hq+kbz8b0tIy5GJPow2IuZrPH0eeiQ4f7yvQjLZg7GWZ+nBkIGh4wdMTC2HMy5IqvaOLL/+7wWDrQVwxp2C0TixSms7vd5H6T5qHKXbfLSbWWoDHIeLjVngZLFQx35z0wTteIPSP7jxMwZLqI4iCAZYzSOAkWA+PkomH+Zpp/iCVGb/PEiLYZQLrSBq1U5uz+IyMmpbFZ14sxq/kGcl3NgtzapF3WTDFYmw2NWMXvOUiRr7jrrN1M46xYgSTJoQn4r4/i2WHSJN/zqg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=cZwe3EGRMHS7LMzxPO0NqLHPrTVzMXNslcM4iUc/9bg=;\n b=MhRMdju0HP0f/a0WVZu0KtzsnvexNh5zc7SFy7zhwDURAqt4U2QxA1XSlqKWbO4dfNl7Nr5ktHxyOy7n/zEZvKqG7aS7RnT8ZZJahmC9bKPNqrNVWps7HCmJndiT4N7fe0kkKwgGneXgbQJvvdrm7E/bnRq4yuKgyb2VvdxFZzVpzaqcZdF+sYhNXlIXp8tbYfWGgTri11rv6mZM/rLoVIjOYIJFD3JzMU4gIspARipNzxLrEKVSvkAnX/5wxLgmqJqjIYgVeI3z9uSWFe5MtbYAPMFXjc8pq16rcsy8bz9sN0AZyGNtjjNsaSuazmpLjSyC25u5axLixnpdNccY6Q==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com;\n dkim=pass header.d=mellanox.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com;\n s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=cZwe3EGRMHS7LMzxPO0NqLHPrTVzMXNslcM4iUc/9bg=;\n b=XgRx7/MwPiJBCuMGmSC/XY6ZtEtmWYoP1BkSTdMrkTCbxGeSp0nlaeK0gKSq8Odn+JyzMqQAg9KGSwPxl7VJ5p68yxwOBVc+A8WL+xqxwkA5H4EXaDBRWp8UGBrU/Bq6TNwZa6S14gcx7JtW3kMl77gHyF7uzcT4wFxl7VDykGc=", "Authentication-Results": "dpdk.org; dkim=none (message not signed)\n header.d=none;dpdk.org; dmarc=none action=none header.from=mellanox.com;", "From": "Ophir Munk <ophirmu@mellanox.com>", "To": "dev@dpdk.org", "Cc": "Raslan Darawsheh <rasland@mellanox.com>,\n Ophir Munk <ophirmu@mellanox.com>,\n Matan Azrad <matan@mellanox.com>", "Date": "Sun, 19 Jul 2020 10:18:16 +0000", "Message-Id": "<20200719101816.16406-9-ophirmu@mellanox.com>", "X-Mailer": [ "git-send-email 2.8.4", "git-send-email 2.8.4" ], "In-Reply-To": "<20200719101816.16406-1-ophirmu@mellanox.com>", "References": "<20200719071112.8540-9-ophirmu@mellanox.com>\n <20200719101816.16406-1-ophirmu@mellanox.com>", "Content-Type": "text/plain", "X-ClientProxiedBy": "AM0PR05CA0090.eurprd05.prod.outlook.com\n (2603:10a6:208:136::30) To AM0PR05MB4209.eurprd05.prod.outlook.com\n (2603:10a6:208:61::22)", "MIME-Version": "1.0", "X-MS-Exchange-MessageSentRepresentingType": "1", "X-Originating-IP": "[37.142.13.130]", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-HT": "Tenant", "X-MS-Office365-Filtering-Correlation-Id": "a0d44d27-dfcb-439d-5e4e-08d82bcd16c5", "X-MS-TrafficTypeDiagnostic": "AM0PR05MB6324:", "X-LD-Processed": "a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtFwd", "X-MS-Exchange-Transport-Forked": "True", "X-Microsoft-Antispam-PRVS": "\n <AM0PR05MB6324C98584ABC1371B31DBEAD17A0@AM0PR05MB6324.eurprd05.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:69;", "X-MS-Exchange-SenderADCheck": "1", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n PFvcs/g1tpoVTTWz0NerrRYhvmVc3/z+lj1DjXindQcozPVqk2NYuftv7WSjonblQnObU7w9FwoybJQYCUNIpEq4raLyzRHWEOiPV4VkWVXXMYzFJOX0/6Cnk/diFVHF1psOdg0kl3GVZ8eGQ9pd/VBvhkJGOn0Ecqx6kjbG3z09RTAl9YrtKYewMDWZnoDczYIKrcYLA/C8vaJa8sQUo83S9eJwE8CVqssci+o3MyzbdE9+GeRdNX4MpjdzIYw27mns4Q+VmskAVg7EM53doqBmbkMMCwS2CoZz+clNnzVOp2RY7ovnLjgj9O1PGh5J", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:AM0PR05MB4209.eurprd05.prod.outlook.com; PTR:; CAT:NONE;\n SFTY:;\n SFS:(4636009)(396003)(346002)(376002)(136003)(39860400002)(366004)(5660300002)(316002)(2906002)(36756003)(54906003)(186003)(2616005)(6666004)(16526019)(4326008)(83380400001)(956004)(30864003)(6916009)(26005)(478600001)(52116002)(7696005)(107886003)(66556008)(86362001)(66476007)(66946007)(1076003)(55016002)(8936002)(8676002)(8886007);\n DIR:OUT; SFP:1101;", "X-MS-Exchange-AntiSpam-MessageData": "\n TMPlYstG59y4Xwax2LXZwpcFFKsr4qAt5w2k4EXYSo+EOhrkxdcN0Y9AjyalWGyAJ5XrCb6qvK+me6pEHV9YSdd0HQLo6LSe/W9YoatJHmIcTPR4zL8YNaTdfpI3z22h3pCez7mHbX6S4Y66PXrTg8mdVbld9xJ+vgySJJMMwQ85dYpkgaeGK/PbcI7Bm7VjrpoHN3tU8dJZdLqUrH7aJIeA5xv2nsUeUVrRmDWbsWlpAIavHnT8TUDTXd5n99jJ/urZLu6yBZglBuSixX++dyqhiSER0mwkuaMHvMDzIfX3s/DGNmjkRa7vuITd4jS0hk7wqo8S8K9jMoFFaYficqsdY1SUinnfuYiAgu+tlq0khSqz4UwLGsl635E+P2MeH/yKpaX7v/d3VLwNbcoZqkBEqnhb94QVPesKZ0zKn7Kg8m2qu7mPFLuTvnNkris3dPXNy8YGnV3xyHhB13h3/GCOaMXCk86exLV1mmDVV22xQzo+z2pWUM9IYAhf16kO", "X-OriginatorOrg": "Mellanox.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n a0d44d27-dfcb-439d-5e4e-08d82bcd16c5", "X-MS-Exchange-CrossTenant-AuthSource": "AM0PR05MB4209.eurprd05.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "19 Jul 2020 10:18:32.8425 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "a652971c-7d2e-4d9b-a6a4-d149256f461b", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n 7DmqGjXcV65CunDqrVOp2IKYTfF1x2hk/rba/V3ChGJVfxEn2yRDnvMtgN2+LX6JUmAMJR2RjaKGY1awud9g/w==", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "AM0PR05MB6324", "Subject": "[dpdk-dev] [PATCH v3 8/8] mlx5: remove inclusion of Verbs header\n\tfiles", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Several source files include Verbs header files as in (1). These source\nfiles will not compile under non-Linux operating systems. This commit\nremoves this inclusion in two cases:\n\nCase 1: There is no usage of ibv_* or mlx5dv_* symbols in the source\nfile so the inclusion in (1) can be safely removed.\n\nCase 2: Verbs symbols are used. Please note the inclusion in (1) already\nappears in file linux/mlx5_glue.h (which represents the interface\nto the rdma-core library). Therefore, replace (1) in the source file\nwith (2). Under non-Linux operating systems - file mlx5_glue.h will not\ninclude (1).\n\n(1)\n #include <infiniband/verbs.h>\n #include <infiniband/mlx5dv.h>\n\n(2)\n #include <mlx5_glue.h>\n\nSigned-off-by: Ophir Munk <ophirmu@mellanox.com>\nAcked-by: Matan Azrad <matan@mellanox.com>\n---\n drivers/common/mlx5/linux/mlx5_common_os.h | 7 +------\n drivers/common/mlx5/linux/mlx5_common_verbs.c | 15 ---------------\n drivers/common/mlx5/mlx5_common_mp.h | 11 +----------\n drivers/common/mlx5/mlx5_common_mr.h | 11 +----------\n drivers/common/mlx5/mlx5_prm.h | 11 +----------\n drivers/net/mlx5/linux/mlx5_os.c | 10 ----------\n drivers/net/mlx5/linux/mlx5_verbs.c | 14 --------------\n drivers/net/mlx5/mlx5.c | 10 ----------\n drivers/net/mlx5/mlx5.h | 10 ----------\n drivers/net/mlx5/mlx5_flow.c | 11 +----------\n drivers/net/mlx5/mlx5_flow.h | 11 +----------\n drivers/net/mlx5/mlx5_flow_dv.c | 11 +----------\n drivers/net/mlx5/mlx5_flow_verbs.c | 10 ----------\n drivers/net/mlx5/mlx5_mac.c | 10 ----------\n drivers/net/mlx5/mlx5_mr.c | 9 ---------\n drivers/net/mlx5/mlx5_mr.h | 11 -----------\n drivers/net/mlx5/mlx5_rss.c | 10 ----------\n drivers/net/mlx5/mlx5_rxmode.c | 11 +----------\n drivers/net/mlx5/mlx5_rxq.c | 11 -----------\n drivers/net/mlx5/mlx5_rxtx.c | 12 +-----------\n drivers/net/mlx5/mlx5_rxtx.h | 11 -----------\n drivers/net/mlx5/mlx5_rxtx_vec.c | 12 +-----------\n drivers/net/mlx5/mlx5_txq.c | 11 -----------\n drivers/net/mlx5/mlx5_vlan.c | 17 -----------------\n 24 files changed, 10 insertions(+), 257 deletions(-)", "diff": "diff --git a/drivers/common/mlx5/linux/mlx5_common_os.h b/drivers/common/mlx5/linux/mlx5_common_os.h\nindex 9a6872c..55c0902 100644\n--- a/drivers/common/mlx5/linux/mlx5_common_os.h\n+++ b/drivers/common/mlx5/linux/mlx5_common_os.h\n@@ -15,12 +15,7 @@\n #include <rte_devargs.h>\n \n #include \"mlx5_autoconf.h\"\n-#ifdef HAVE_INFINIBAND_VERBS_H\n-#include <infiniband/verbs.h>\n-#endif\n-#ifdef HAVE_INFINIBAND_MLX5DV_H\n-#include <infiniband/mlx5dv.h>\n-#endif\n+#include \"mlx5_glue.h\"\n \n /**\n * Get device name. Given an ibv_device pointer - return a\ndiff --git a/drivers/common/mlx5/linux/mlx5_common_verbs.c b/drivers/common/mlx5/linux/mlx5_common_verbs.c\nindex a2fc7a3..339535d 100644\n--- a/drivers/common/mlx5/linux/mlx5_common_verbs.c\n+++ b/drivers/common/mlx5/linux/mlx5_common_verbs.c\n@@ -10,22 +10,7 @@\n #include <sys/mman.h>\n #include <inttypes.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n #include \"mlx5_autoconf.h\"\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#ifdef HAVE_INFINIBAND_VERBS_H\n-#include <infiniband/verbs.h>\n-#endif\n-#ifdef HAVE_INFINIBAND_MLX5DV_H\n-#include <infiniband/mlx5dv.h>\n-#endif\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <mlx5_glue.h>\n #include <mlx5_common.h>\n #include <mlx5_common_mr.h>\ndiff --git a/drivers/common/mlx5/mlx5_common_mp.h b/drivers/common/mlx5/mlx5_common_mp.h\nindex 05466fd..64260c0 100644\n--- a/drivers/common/mlx5/mlx5_common_mp.h\n+++ b/drivers/common/mlx5/mlx5_common_mp.h\n@@ -6,16 +6,7 @@\n #ifndef RTE_PMD_MLX5_COMMON_MP_H_\n #define RTE_PMD_MLX5_COMMON_MP_H_\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n+#include <mlx5_glue.h>\n #include <rte_eal.h>\n #include <rte_string_fns.h>\n \ndiff --git a/drivers/common/mlx5/mlx5_common_mr.h b/drivers/common/mlx5/mlx5_common_mr.h\nindex b23ee66..a2c426d 100644\n--- a/drivers/common/mlx5/mlx5_common_mr.h\n+++ b/drivers/common/mlx5/mlx5_common_mr.h\n@@ -10,21 +10,12 @@\n #include <stdint.h>\n #include <sys/queue.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#include <infiniband/mlx5dv.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n \n #include <rte_rwlock.h>\n #include <rte_bitmap.h>\n #include <rte_memory.h>\n \n+#include \"mlx5_glue.h\"\n #include \"mlx5_common_mp.h\"\n \n /* Size of per-queue MR cache array for linear search. */\ndiff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h\nindex 4847c6e..cb5f968 100644\n--- a/drivers/common/mlx5/mlx5_prm.h\n+++ b/drivers/common/mlx5/mlx5_prm.h\n@@ -6,21 +6,12 @@\n #ifndef RTE_PMD_MLX5_PRM_H_\n #define RTE_PMD_MLX5_PRM_H_\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/mlx5dv.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <unistd.h>\n \n #include <rte_vect.h>\n #include <rte_byteorder.h>\n \n+#include <mlx5_glue.h>\n #include \"mlx5_autoconf.h\"\n \n /* RSS hash key size. */\ndiff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c\nindex 70460ee..6d15ee2 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_os.c\n@@ -15,16 +15,6 @@\n #include <linux/ethtool.h>\n #include <fcntl.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_malloc.h>\n #include <rte_ethdev_driver.h>\n #include <rte_ethdev_pci.h>\ndiff --git a/drivers/net/mlx5/linux/mlx5_verbs.c b/drivers/net/mlx5/linux/mlx5_verbs.c\nindex 5ac6982..d41b0fe 100644\n--- a/drivers/net/mlx5/linux/mlx5_verbs.c\n+++ b/drivers/net/mlx5/linux/mlx5_verbs.c\n@@ -9,21 +9,7 @@\n #include <unistd.h>\n #include <inttypes.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n #include \"mlx5_autoconf.h\"\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#ifdef HAVE_INFINIBAND_VERBS_H\n-#include <infiniband/verbs.h>\n-#endif\n-#ifdef HAVE_INFINIBAND_MLX5DV_H\n-#include <infiniband/mlx5dv.h>\n-#endif\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n \n #include <rte_mbuf.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex b6d5953..466fa0f 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -13,16 +13,6 @@\n #include <sys/mman.h>\n #include <linux/rtnetlink.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_malloc.h>\n #include <rte_ethdev_driver.h>\n #include <rte_ethdev_pci.h>\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex ae9f5ff..c00d527 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -14,16 +14,6 @@\n #include <netinet/in.h>\n #include <sys/queue.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_pci.h>\n #include <rte_ether.h>\n #include <rte_ethdev_driver.h>\ndiff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex 52047db..e83cf83 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -10,16 +10,6 @@\n #include <string.h>\n #include <stdbool.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_common.h>\n #include <rte_ether.h>\n #include <rte_ethdev_driver.h>\n@@ -29,6 +19,7 @@\n #include <rte_malloc.h>\n #include <rte_ip.h>\n \n+#include <mlx5_glue.h>\n #include <mlx5_devx_cmds.h>\n #include <mlx5_prm.h>\n #include <mlx5_malloc.h>\ndiff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex 314b5e3..73cfa6e 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -11,20 +11,11 @@\n #include <stdint.h>\n #include <string.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_atomic.h>\n #include <rte_alarm.h>\n #include <rte_mtr.h>\n \n+#include <mlx5_glue.h>\n #include <mlx5_prm.h>\n \n #include \"mlx5.h\"\ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex 68dff23..ee66a44 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -8,16 +8,6 @@\n #include <string.h>\n #include <unistd.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_common.h>\n #include <rte_ether.h>\n #include <rte_ethdev_driver.h>\n@@ -31,6 +21,7 @@\n #include <rte_gtp.h>\n #include <rte_eal_paging.h>\n \n+#include <mlx5_glue.h>\n #include <mlx5_devx_cmds.h>\n #include <mlx5_prm.h>\n #include <mlx5_malloc.h>\ndiff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c\nindex 5d11ba7..905a122 100644\n--- a/drivers/net/mlx5/mlx5_flow_verbs.c\n+++ b/drivers/net/mlx5/mlx5_flow_verbs.c\n@@ -8,16 +8,6 @@\n #include <stdint.h>\n #include <string.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_common.h>\n #include <rte_ether.h>\n #include <rte_ethdev_driver.h>\ndiff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c\nindex 2a88086..2d808d6 100644\n--- a/drivers/net/mlx5/mlx5_mac.c\n+++ b/drivers/net/mlx5/mlx5_mac.c\n@@ -12,16 +12,6 @@\n #include <sys/ioctl.h>\n #include <arpa/inet.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_ether.h>\n #include <rte_ethdev_driver.h>\n #include <rte_common.h>\ndiff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c\nindex 3b781b6..dbcf0aa 100644\n--- a/drivers/net/mlx5/mlx5_mr.c\n+++ b/drivers/net/mlx5/mlx5_mr.c\n@@ -3,21 +3,12 @@\n * Copyright 2016 Mellanox Technologies, Ltd\n */\n \n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_eal_memconfig.h>\n #include <rte_mempool.h>\n #include <rte_malloc.h>\n #include <rte_rwlock.h>\n #include <rte_bus_pci.h>\n \n-#include <mlx5_glue.h>\n #include <mlx5_common_mp.h>\n #include <mlx5_common_mr.h>\n \ndiff --git a/drivers/net/mlx5/mlx5_mr.h b/drivers/net/mlx5/mlx5_mr.h\nindex 0c5877b..4a7fab6 100644\n--- a/drivers/net/mlx5/mlx5_mr.h\n+++ b/drivers/net/mlx5/mlx5_mr.h\n@@ -10,17 +10,6 @@\n #include <stdint.h>\n #include <sys/queue.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#include <infiniband/mlx5dv.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_ethdev.h>\n #include <rte_rwlock.h>\n #include <rte_bitmap.h>\ndiff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c\nindex a49edbc..a63cc8d 100644\n--- a/drivers/net/mlx5/mlx5_rss.c\n+++ b/drivers/net/mlx5/mlx5_rss.c\n@@ -8,16 +8,6 @@\n #include <errno.h>\n #include <string.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_malloc.h>\n #include <rte_ethdev_driver.h>\n \ndiff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c\nindex 80b1256..7613ff7 100644\n--- a/drivers/net/mlx5/mlx5_rxmode.c\n+++ b/drivers/net/mlx5/mlx5_rxmode.c\n@@ -7,18 +7,9 @@\n #include <errno.h>\n #include <string.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_ethdev_driver.h>\n \n+#include <mlx5_glue.h>\n #include \"mlx5.h\"\n #include \"mlx5_rxtx.h\"\n #include \"mlx5_utils.h\"\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 9e7df8e..9ef6bdd 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -10,17 +10,6 @@\n #include <fcntl.h>\n #include <sys/queue.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#include <infiniband/mlx5dv.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_mbuf.h>\n #include <rte_malloc.h>\n #include <rte_ethdev_driver.h>\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c\nindex 65239f9..3eb0243 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.c\n+++ b/drivers/net/mlx5/mlx5_rxtx.c\n@@ -7,17 +7,6 @@\n #include <string.h>\n #include <stdlib.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#include <infiniband/mlx5dv.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_mbuf.h>\n #include <rte_mempool.h>\n #include <rte_prefetch.h>\n@@ -27,6 +16,7 @@\n #include <rte_cycles.h>\n #include <rte_flow.h>\n \n+#include <mlx5_glue.h>\n #include <mlx5_devx_cmds.h>\n #include <mlx5_prm.h>\n #include <mlx5_common.h>\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h\nindex 5116a15..35a22b6 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.h\n+++ b/drivers/net/mlx5/mlx5_rxtx.h\n@@ -10,17 +10,6 @@\n #include <stdint.h>\n #include <sys/queue.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#include <infiniband/mlx5dv.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_mbuf.h>\n #include <rte_mempool.h>\n #include <rte_common.h>\ndiff --git a/drivers/net/mlx5/mlx5_rxtx_vec.c b/drivers/net/mlx5/mlx5_rxtx_vec.c\nindex 7fae201..711dcd3 100644\n--- a/drivers/net/mlx5/mlx5_rxtx_vec.c\n+++ b/drivers/net/mlx5/mlx5_rxtx_vec.c\n@@ -7,21 +7,11 @@\n #include <string.h>\n #include <stdlib.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#include <infiniband/mlx5dv.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_mbuf.h>\n #include <rte_mempool.h>\n #include <rte_prefetch.h>\n \n+#include <mlx5_glue.h>\n #include <mlx5_prm.h>\n \n #include \"mlx5_defs.h\"\ndiff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c\nindex d245a54..7da5c70 100644\n--- a/drivers/net/mlx5/mlx5_txq.c\n+++ b/drivers/net/mlx5/mlx5_txq.c\n@@ -10,17 +10,6 @@\n #include <unistd.h>\n #include <inttypes.h>\n \n-/* Verbs header. */\n-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/verbs.h>\n-#include <infiniband/mlx5dv.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_mbuf.h>\n #include <rte_malloc.h>\n #include <rte_ethdev_driver.h>\ndiff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c\nindex 4308b71..89983a4 100644\n--- a/drivers/net/mlx5/mlx5_vlan.c\n+++ b/drivers/net/mlx5/mlx5_vlan.c\n@@ -8,23 +8,6 @@\n #include <stdint.h>\n #include <unistd.h>\n \n-\n-/*\n- * Not needed by this file; included to work around the lack of off_t\n- * definition for mlx5dv.h with unpatched rdma-core versions.\n- */\n-#include <sys/types.h>\n-\n-/* Verbs headers do not support -pedantic. */\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic ignored \"-Wpedantic\"\n-#endif\n-#include <infiniband/mlx5dv.h>\n-#include <infiniband/verbs.h>\n-#ifdef PEDANTIC\n-#pragma GCC diagnostic error \"-Wpedantic\"\n-#endif\n-\n #include <rte_ethdev_driver.h>\n #include <rte_common.h>\n #include <rte_malloc.h>\n", "prefixes": [ "v3", "8/8" ] }