From: Shahaf Shuler Date: Thu, 12 Jul 2018 06:40:32 +0000 (+0300) Subject: net/mlx5: fix build with rdma-core v19 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=06b1fe3f6d2121009b3b879e92b8cca25d4c0c42;p=dpdk.git net/mlx5: fix build with rdma-core v19 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") Cc: stable@dpdk.org Reported-by: Stephen Hemminger Reported-by: Ferruh Yigit Signed-off-by: Shahaf Shuler Acked-by: Ori Kam --- diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 9e274964b4..d86c6bbab9 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) $Q sh -- '$<' '$@' \ HAVE_RDMA_NL_NLDEV \