[dpdk-stable] patch 'common/mlx5: fix void parameters in glue wrappers' has been queued to stable release 19.11.4

luca.boccassi at gmail.com luca.boccassi at gmail.com
Thu Aug 6 11:53:31 CEST 2020


Hi,

FYI, your patch has been queued to stable release 19.11.4

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/08/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 5a68d9a798279cbe9a763deedb9ac575ca967ac1 Mon Sep 17 00:00:00 2001
From: Parav Pandit <parav at mellanox.com>
Date: Mon, 27 Jul 2020 20:47:09 +0300
Subject: [PATCH] common/mlx5: fix void parameters in glue wrappers

[ upstream commit 4c093ffa5b9bdebad9ef14ef4136624a7f44b0f6 ]

Following two errors are reported when compiled with
gcc (GCC) 8.3.1 20191121 (Red Hat 8.3.1-5).

drivers/common/mlx5/linux/mlx5_glue.h:188:2:
error: function declaration isn't a prototype [-Werror=strict-prototypes]

drivers/common/mlx5/linux/mlx5_glue.h:188:2:
error: function declaration isn't a prototype [-Werror=strict-prototypes]

Fix them by adding void data type in empty argument list.

Fixes: 34fa7c0268e7 ("net/mlx5: add drop action to Direct Verbs E-Switch")
Fixes: 400d985eb586 ("net/mlx5: add VLAN push/pop DR commands to glue")

Signed-off-by: Parav Pandit <parav at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/mlx5/mlx5_glue.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h
index 4e6465523..9895e5597 100644
--- a/drivers/net/mlx5/mlx5_glue.h
+++ b/drivers/net/mlx5/mlx5_glue.h
@@ -167,11 +167,11 @@ struct mlx5_glue {
 	void *(*dr_create_flow_action_dest_flow_tbl)(void *tbl);
 	void *(*dr_create_flow_action_dest_port)(void *domain,
 						 uint32_t port);
-	void *(*dr_create_flow_action_drop)();
+	void *(*dr_create_flow_action_drop)(void);
 	void *(*dr_create_flow_action_push_vlan)
 					(struct mlx5dv_dr_domain *domain,
 					 rte_be32_t vlan_tag);
-	void *(*dr_create_flow_action_pop_vlan)();
+	void *(*dr_create_flow_action_pop_vlan)(void);
 	void *(*dr_create_flow_tbl)(void *domain, uint32_t level);
 	int (*dr_destroy_flow_tbl)(void *tbl);
 	void *(*dr_create_domain)(struct ibv_context *ctx,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:15.931989125 +0100
+++ 0003-common-mlx5-fix-void-parameters-in-glue-wrappers.patch	2020-08-06 10:53:15.700595422 +0100
@@ -1,8 +1,10 @@
-From 4c093ffa5b9bdebad9ef14ef4136624a7f44b0f6 Mon Sep 17 00:00:00 2001
+From 5a68d9a798279cbe9a763deedb9ac575ca967ac1 Mon Sep 17 00:00:00 2001
 From: Parav Pandit <parav at mellanox.com>
 Date: Mon, 27 Jul 2020 20:47:09 +0300
 Subject: [PATCH] common/mlx5: fix void parameters in glue wrappers
 
+[ upstream commit 4c093ffa5b9bdebad9ef14ef4136624a7f44b0f6 ]
+
 Following two errors are reported when compiled with
 gcc (GCC) 8.3.1 20191121 (Red Hat 8.3.1-5).
 
@@ -16,19 +18,18 @@
 
 Fixes: 34fa7c0268e7 ("net/mlx5: add drop action to Direct Verbs E-Switch")
 Fixes: 400d985eb586 ("net/mlx5: add VLAN push/pop DR commands to glue")
-Cc: stable at dpdk.org
 
 Signed-off-by: Parav Pandit <parav at mellanox.com>
 Acked-by: Matan Azrad <matan at mellanox.com>
 ---
- drivers/common/mlx5/linux/mlx5_glue.h | 4 ++--
+ drivers/net/mlx5/mlx5_glue.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/common/mlx5/linux/mlx5_glue.h b/drivers/common/mlx5/linux/mlx5_glue.h
-index c4f9b006a..734ace2a3 100644
---- a/drivers/common/mlx5/linux/mlx5_glue.h
-+++ b/drivers/common/mlx5/linux/mlx5_glue.h
-@@ -185,11 +185,11 @@ struct mlx5_glue {
+diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h
+index 4e6465523..9895e5597 100644
+--- a/drivers/net/mlx5/mlx5_glue.h
++++ b/drivers/net/mlx5/mlx5_glue.h
+@@ -167,11 +167,11 @@ struct mlx5_glue {
  	void *(*dr_create_flow_action_dest_flow_tbl)(void *tbl);
  	void *(*dr_create_flow_action_dest_port)(void *domain,
  						 uint32_t port);


More information about the stable mailing list