Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/74012/?format=api
{ "id": 74012, "url": "http://patchwork.dpdk.org/api/patches/74012/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20200714142102.30606-9-ophirmu@mellanox.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20200714142102.30606-9-ophirmu@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200714142102.30606-9-ophirmu@mellanox.com", "date": "2020-07-14T14:21:02", "name": "[v1,8/8] mlx5: remove inclusion of verbs header files", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "679a61ba9d6013a49c3a4627a1263e898ef3eff6", "submitter": { "id": 793, "url": "http://patchwork.dpdk.org/api/people/793/?format=api", "name": "Ophir Munk", "email": "ophirmu@mellanox.com" }, "delegate": { "id": 3268, "url": "http://patchwork.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20200714142102.30606-9-ophirmu@mellanox.com/mbox/", "series": [ { "id": 11020, "url": "http://patchwork.dpdk.org/api/series/11020/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=11020", "date": "2020-07-14T14:20:54", "name": "mlx5 PMD multi OS support - part #3", "version": 1, "mbox": "http://patchwork.dpdk.org/series/11020/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/74012/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/74012/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 A0E2DA0540;\n\tTue, 14 Jul 2020 16:22:44 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 060B61D57A;\n\tTue, 14 Jul 2020 16:21:24 +0200 (CEST)", "from EUR04-DB3-obe.outbound.protection.outlook.com\n (mail-eopbgr60065.outbound.protection.outlook.com [40.107.6.65])\n by dpdk.org (Postfix) with ESMTP id 78FEC1D55F\n for <dev@dpdk.org>; Tue, 14 Jul 2020 16:21:18 +0200 (CEST)", "from AM0PR05MB4209.eurprd05.prod.outlook.com (2603:10a6:208:61::22)\n by AM0PR05MB4625.eurprd05.prod.outlook.com (2603:10a6:208:b6::17)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.24; Tue, 14 Jul\n 2020 14:21:17 +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.3174.026; Tue, 14 Jul 2020\n 14:21:17 +0000", "from mellanox.com (37.142.13.130) by\n AM3PR05CA0100.eurprd05.prod.outlook.com (2603:10a6:207:1::26) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.3174.21 via Frontend Transport; Tue, 14 Jul 2020 14:21:16 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=awEhzIycZlrDEKiqA8PzJrMpzHjQxJgY1+u8k4P4XSh1N42S4IqP1xdrRo5lj8yPWRdUr5lcJ0bPoRyaZXJwbA6xmqr7q0qVnKxCGWTUspNfrwhdZDQ4uCd+6ou9qYwoUrLkitdOrJ/VC8pX1EyDIYFVxlcNJbQyLrw55Y5HOwlKwNdYjuFB1/KXbFtGV5i74KXwFZhCY5bDonFFYqZ7iv2AIFaloOPnmv4lupEcEjnEW/g1+a3r3mF94eK9gnCzQGcO2wXjS0bGfrQgyxMjCYIJF++eNjJBy1nglFWpn7JgqTUUorjX35FnODet4AQLuFQb+lEI305zZ+Gd6PoUgA==", "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=G9yysqJ8ZGRh1SZFduQf79sTRmHmd/wWj6zCTUTCk/Y=;\n b=fR1CruagQgTNwzaVhL57WHGv45UmlRgtTh38vzwget9uHm1a4H6hbU1xofGy70dejW0NQgx+MGTcfzg5xqph7XjoOmpbJtswvqS3oYfH8wJHoX91Ixnk6lTnoN5gPhczFWR1Qcni3eE6Aqp3gSOLcybVs0ZGnf091DaXQ0o0PKn10bEcslYk9Bsca6e8a+NJ+Bcq3Ocp8d6fPjtVfAxI9yhm/217pWQV90KM6jN2W9Gs2PSZfWzLldSuBRcNDRdzAZ46IqeB7OBGWWW+JEkHmd4fQeBfB5cuEMLb3icNRbOQqNu9ika0rynFOpkzLqXFFaZzqDpSIdMrgZnjosIDgQ==", "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=G9yysqJ8ZGRh1SZFduQf79sTRmHmd/wWj6zCTUTCk/Y=;\n b=ZxGt6E9Z4rKEYJRr55I7vZB6pBDGNA8i7yS3U62EaHycjcJsHsF47HBb8Fag/ffILxQgBjNRCQ6VckECvRE8qFdddas4WF5ru3SrE0LmFfGZgj9JYc9735dVN+5/JMX6UpAe2A76mWiOs1hBjc+N1GVT4+7xPgqB0micGizvr18=", "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": "Tue, 14 Jul 2020 14:21:02 +0000", "Message-Id": "<20200714142102.30606-9-ophirmu@mellanox.com>", "X-Mailer": [ "git-send-email 2.8.4", "git-send-email 2.8.4" ], "In-Reply-To": "<20200714142102.30606-1-ophirmu@mellanox.com>", "References": "<20200714142102.30606-1-ophirmu@mellanox.com>", "Content-Type": "text/plain", "X-ClientProxiedBy": "AM3PR05CA0100.eurprd05.prod.outlook.com\n (2603:10a6:207:1::26) 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": "d3e8e00a-8e87-4227-2b83-08d828012bff", "X-MS-TrafficTypeDiagnostic": "AM0PR05MB4625:", "X-LD-Processed": "a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtFwd", "X-MS-Exchange-Transport-Forked": "True", "X-Microsoft-Antispam-PRVS": "\n <AM0PR05MB4625FEF744425A0C36718C13D1610@AM0PR05MB4625.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 H2lR0obop19QCC5bLOLWux2d0vwTrGtOqImTWHu2LhnKElPVQ6MvacWvy63Nb2JNQEn/kT5xgjt0AWrvDBuFK5OOLO6XM3Bumk9DflgS851BVGOxajLDyKp3EWBkYC46iC5O5KgDo0tcJfTVXfIPfFAZCdBKgPW+7pC0lI6ZUOy8whjS+LcdWnG5jRel0GDIgUi0LP78neV5fZ4ghiAFbNsyLBIR1y6SIpVWbuyho8De7LaLRY+WBlVHOIShCMAUSulGkibhB/tpbMGiy1JWi1aNNiJMz3JrMziFJ6Q5qBClMNJIY61tpwBXdF8rznlA", "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)(136003)(366004)(376002)(39850400004)(346002)(396003)(36756003)(86362001)(1076003)(30864003)(8886007)(6666004)(66946007)(316002)(66476007)(52116002)(7696005)(5660300002)(26005)(66556008)(54906003)(478600001)(6916009)(83380400001)(16526019)(8676002)(8936002)(4326008)(956004)(2616005)(107886003)(2906002)(55016002)(186003);\n DIR:OUT; SFP:1101;", "X-MS-Exchange-AntiSpam-MessageData": "\n 99zm2WP2LgNoHNG2Kp/7bacyda4yN6rMP2b7M9dNYV+Si3RLwb4j2hZQu2o6qW3utaDgeLw0Vn4ttm/P7Yf+S9y5cd4AoJENd/T5KflAaH7IcA0tWyncNxTNR05ypVplX0v2GuVLH6Ko20l0C6mjrKMv/n7JJDR6oWz4pMg65xHPnhFGkV6FbID6mjFo+U1/+Z5JSLiizatw2ZEtAxhcZ43ZMzh0zgyCwEvQUmllc0GDuCTnr0GpVpm5K0I5/d4VxmMcWFhYioDgVA7gJt6GPoHdrWleZ8ZYWfpUMgky+88guEQ5rIWshA5IBuCwSS/UOZrq4I6eGTRu3RDHMUuSEG3aCkOjZ5EjjQ7nnu3CqnhyiAwZs+F2J3Rtjl7nNg5slz06R9onvCVqXoVmHaJBSjfTErtFGUai0MFbUsrZYf5GYdtOvIQxFjV805ZVYbqQMaxkDw2hoA9kZUdRvtTfk8mnPJcCNADU36DrZ2vmaaH0t9b2WB7NvoJwe+34/HE9", "X-OriginatorOrg": "Mellanox.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n d3e8e00a-8e87-4227-2b83-08d828012bff", "X-MS-Exchange-CrossTenant-AuthSource": "AM0PR05MB4209.eurprd05.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "14 Jul 2020 14:21:17.4074 (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 x6denHWgDHnvDZYvVff+VRoOzXwqA7Grb7oTUZ3uawxHpehU1TxRBJ5Qpl7nZmw/otjCYp5k/1274d9MFmYo2w==", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "AM0PR05MB4625", "Subject": "[dpdk-dev] [PATCH v1 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 1b7b4c7..9ae2386 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 2385d69..37903ed 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 10a0306..5dff36a 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 fa223a1..d6372eb 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 5fdf6df..4b90269 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 \ndiff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex 616c14a..bc0066a 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 7ce30e0..8ec8755 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 \ndiff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c\nindex 9b8ae5b..544b26d 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 653b069..f11851f 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 637b131..2308ae8 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 894f441..86b0e8b 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 26621ff..43a4406 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 a9bf42d..e9f5a8c 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 f65e416..6e1d71f 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": [ "v1", "8/8" ] }