summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShahaf Shuler <shahafs@mellanox.com>2018-07-12 09:40:32 +0300
committerShahaf Shuler <shahafs@mellanox.com>2018-07-12 12:53:59 +0200
commit06b1fe3f6d2121009b3b879e92b8cca25d4c0c42 (patch)
tree5f71c2899f4f18af943f49e4ab13732959448055
parent60bd8c9747e861c49d67875128960bd12fb6a208 (diff)
downloaddpdk-06b1fe3f6d2121009b3b879e92b8cca25d4c0c42.zip
dpdk-06b1fe3f6d2121009b3b879e92b8cca25d4c0c42.tar.gz
dpdk-06b1fe3f6d2121009b3b879e92b8cca25d4c0c42.tar.xz
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 <stephen@networkplumber.org> Reported-by: Ferruh Yigit <ferruh.yigit@intel.com> Signed-off-by: Shahaf Shuler <shahafs@mellanox.com> Acked-by: Ori Kam <orika@mellanox.com>
-rw-r--r--drivers/net/mlx5/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index 9e27496..d86c6bb 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 \