patch 'net/hns3: delete duplicate macro definition' has been queued to stable release 22.11.3

Xueming Li xuemingl at nvidia.com
Thu Aug 10 01:58:40 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.11.3

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/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=9b9ae1aff19d9b03c75f3c84183bb8fcfce2320f

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 9b9ae1aff19d9b03c75f3c84183bb8fcfce2320f Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Thu, 29 Jun 2023 21:21:26 +0800
Subject: [PATCH] net/hns3: delete duplicate macro definition
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit a939584a45dff2c5d855d25bf4867ba07428bdfc ]

This patch delete some duplicate macro definitions.

Fixes: a4c7152d0581 ("net/hns3: extract common code to its own file")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3 at huawei.com>
---
 drivers/net/hns3/hns3_ethdev.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 046a37b7d3..58572948fe 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -871,13 +871,6 @@ struct hns3_adapter {
 	struct hns3_ptype_table ptype_tbl __rte_cache_aligned;
 };
 
-#define HNS3_DEVARG_RX_FUNC_HINT	"rx_func_hint"
-#define HNS3_DEVARG_TX_FUNC_HINT	"tx_func_hint"
-
-#define HNS3_DEVARG_DEV_CAPS_MASK	"dev_caps_mask"
-
-#define HNS3_DEVARG_MBX_TIME_LIMIT_MS	"mbx_time_limit_ms"
-
 enum hns3_dev_cap {
 	HNS3_DEV_SUPPORT_DCB_B,
 	HNS3_DEV_SUPPORT_COPPER_B,
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-08-09 21:51:19.747353800 +0800
+++ 0061-net-hns3-delete-duplicate-macro-definition.patch	2023-08-09 21:51:18.204352000 +0800
@@ -1 +1 @@
-From a939584a45dff2c5d855d25bf4867ba07428bdfc Mon Sep 17 00:00:00 2001
+From 9b9ae1aff19d9b03c75f3c84183bb8fcfce2320f Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit a939584a45dff2c5d855d25bf4867ba07428bdfc ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
-index c58094d87b..c85a6912ad 100644
+index 046a37b7d3..58572948fe 100644
@@ -21 +23 @@
-@@ -873,13 +873,6 @@ struct hns3_adapter {
+@@ -871,13 +871,6 @@ struct hns3_adapter {


More information about the stable mailing list