Drop MLX5 patch, merged upstream

Change-Id: I680283dc1b940b3c215057d7f8a8568727e2ad2b
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

diff --git a/debian/patches/net-mlx5-fix-build-with-rdma-core-v19.patch b/debian/patches/net-mlx5-fix-build-with-rdma-core-v19.patch
deleted file mode 100644 (file)
index 90ac3c9..0000000
--- a/debian/patches/net-mlx5-fix-build-with-rdma-core-v19.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 06b1fe3f6d2121009b3b879e92b8cca25d4c0c42 Mon Sep 17 00:00:00 2001
-From: Shahaf Shuler <shahafs@mellanox.com>
-Date: Thu, 12 Jul 2018 09:40:32 +0300
-Subject: [PATCH] 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
-
-Note: lacking b42c000 "net/mlx5: remove flow support" this was not
-enough and needed special handling for ibv_flow_spec_counter_action.
-
-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>
-
-Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Original-Author: Shahaf Shuler <shahafs@mellanox.com>
-Origin: backport, http://git.dpdk.org/dpdk/commit/?id=06b1fe3f6d2121009b3b879e92b8cca25d4c0c42
-Last-Update: 2018-06-17
----
- drivers/net/mlx5/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/mlx5/Makefile
-+++ b/drivers/net/mlx5/Makefile
-@@ -145,7 +145,12 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtoo
-       $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_IBV_FLOW_SPEC_COUNTER_ACTION \
-+              infiniband/verbs.h \
-+              type 'struct ibv_flow_spec_counter_action' \
-               $(AUTOCONF_OUTPUT)
- 
- # Create mlx5_autoconf.h or update it in case it differs from the new one.
---- a/drivers/net/mlx5/mlx5_flow.c
-+++ b/drivers/net/mlx5/mlx5_flow.c
-@@ -66,9 +66,15 @@
- struct ibv_counter_set_init_attr {
-       int dummy;
- };
-+/* rdma-core v19 has no ibv_counter_set_init_attr, but it has
-+ * ibv_flow_spec_counter_action which would conflict.
-+ * Newer DPDK, doesn't have the issue due to the series starting with
-+ * "net/mlx5: remove flow support" */
-+#ifndef HAVE_IBV_FLOW_SPEC_COUNTER_ACTION
- struct ibv_flow_spec_counter_action {
-       int dummy;
- };
-+#endif
- struct ibv_counter_set {
-       int dummy;
- };

diff --git a/debian/patches/series b/debian/patches/series
index 4969a43..9aaf349 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 fix-vhost-user-socket-permission.patch
 testpmd-link-virtio.patch
 app-testpmd-add-ethernet-peer-command.patch
-net-mlx5-fix-build-with-rdma-core-v19.patch