[dpdk-stable] patch 'net/mlx5: remove drop queue function prototypes' has been queued to stable release 19.11.9

Christian Ehrhardt christian.ehrhardt at canonical.com
Mon May 17 18:10:03 CEST 2021


Hi,

FYI, your patch has been queued to stable release 19.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/19/21. 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.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/e6b2e350305373268829110c3d7913e2b3a71e15

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From e6b2e350305373268829110c3d7913e2b3a71e15 Mon Sep 17 00:00:00 2001
From: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
Date: Mon, 5 Apr 2021 10:07:16 +0000
Subject: [PATCH] net/mlx5: remove drop queue function prototypes

[ upstream commit a4af5eed4091f74c10381f1e5d5ec1a058f19a9a ]

There are some leftovers of removed code - there are
no drop queue handling routines anymore.

Fixes: 78be885295b8 ("net/mlx5: handle drop queues as regular queues")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 0e4a5f870d..f3b6ece195 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -966,8 +966,6 @@ int mlx5_ctrl_flow(struct rte_eth_dev *dev,
 		   struct rte_flow_item_eth *eth_spec,
 		   struct rte_flow_item_eth *eth_mask);
 struct rte_flow *mlx5_flow_create_esw_table_zero_flow(struct rte_eth_dev *dev);
-int mlx5_flow_create_drop_queue(struct rte_eth_dev *dev);
-void mlx5_flow_delete_drop_queue(struct rte_eth_dev *dev);
 void mlx5_flow_async_pool_query_handle(struct mlx5_ibv_shared *sh,
 				       uint64_t async_id, int status);
 void mlx5_set_query_alarm(struct mlx5_ibv_shared *sh);
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:36.204676022 +0200
+++ 0174-net-mlx5-remove-drop-queue-function-prototypes.patch	2021-05-17 17:40:29.503812091 +0200
@@ -1 +1 @@
-From a4af5eed4091f74c10381f1e5d5ec1a058f19a9a Mon Sep 17 00:00:00 2001
+From e6b2e350305373268829110c3d7913e2b3a71e15 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a4af5eed4091f74c10381f1e5d5ec1a058f19a9a ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 378b68e4be..d4aec717f0 100644
+index 0e4a5f870d..f3b6ece195 100644
@@ -21 +22,2 @@
-@@ -1544,8 +1544,6 @@ int mlx5_ctrl_flow(struct rte_eth_dev *dev,
+@@ -966,8 +966,6 @@ int mlx5_ctrl_flow(struct rte_eth_dev *dev,
+ 		   struct rte_flow_item_eth *eth_spec,
@@ -23 +24,0 @@
- int mlx5_flow_lacp_miss(struct rte_eth_dev *dev);
@@ -27 +28 @@
- void mlx5_flow_async_pool_query_handle(struct mlx5_dev_ctx_shared *sh,
+ void mlx5_flow_async_pool_query_handle(struct mlx5_ibv_shared *sh,
@@ -29 +30 @@
- void mlx5_set_query_alarm(struct mlx5_dev_ctx_shared *sh);
+ void mlx5_set_query_alarm(struct mlx5_ibv_shared *sh);


More information about the stable mailing list