From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by dpdk.org (Postfix) with ESMTP id E06BC5B3A for ; Mon, 30 Jul 2018 18:22:15 +0200 (CEST) Received: from 1.general.paelzer.uk.vpn ([10.172.196.172] helo=lap.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fkAra-00009D-5S; Mon, 30 Jul 2018 16:17:38 +0000 From: Christian Ehrhardt To: Shahaf Shuler Cc: Stephen Hemminger , Ferruh Yigit , Ori Kam , dpdk stable Date: Mon, 30 Jul 2018 18:12:42 +0200 Message-Id: <20180730161342.16566-117-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730161342.16566-1-christian.ehrhardt@canonical.com> References: <20180730161342.16566-1-christian.ehrhardt@canonical.com> Subject: [dpdk-stable] patch 'net/mlx5: fix build with rdma-core v19' has been queued to stable release 18.05.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2018 16:22:16 -0000 Hi, FYI, your patch has been queued to stable release 18.05.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/01/18. So please shout if anyone has objections. Thanks. Christian Ehrhardt --- >>From c74ede60bda78c19af6f4bd9cf9fe93808317c8c Mon Sep 17 00:00:00 2001 From: Shahaf Shuler Date: Thu, 12 Jul 2018 09:40:32 +0300 Subject: [PATCH] net/mlx5: fix build with rdma-core v19 [ upstream commit 06b1fe3f6d2121009b3b879e92b8cca25d4c0c42 ] The flow counter support introduced by commit 9a761de8ea14 ("net/mlx5: flow counter support") was intend to work only with MLNX_OFED_4.3 as the upstream rdma-core libraries were lack such support. On rdma-core v19 the support for the flow counters was added but with different user APIs, hence causing compilation issues on the PMD. This patch fix the compilation errors by forcing the flow counters to be enabled only with MLNX_OFED APIs. Once MLNX_OFED and rdma-core APIs will be aligned, a proper patch to support the new API will be submitted. Fixes: 9a761de8ea14 ("net/mlx5: flow counter support") Reported-by: Stephen Hemminger Reported-by: Ferruh Yigit Signed-off-by: Shahaf Shuler Acked-by: Ori Kam --- drivers/net/mlx5/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 8a5229e61..03bbfc309 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -150,7 +150,7 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh $Q sh -- '$<' '$@' \ HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT \ infiniband/verbs.h \ - enum IBV_FLOW_SPEC_ACTION_COUNT \ + type 'struct ibv_counter_set_init_attr' \ $(AUTOCONF_OUTPUT) # Create mlx5_autoconf.h or update it in case it differs from the new one. -- 2.17.1