patch 'net/hns3: remove duplicate macro definition' has been queued to stable release 20.11.5

luca.boccassi at gmail.com luca.boccassi at gmail.com
Wed Mar 9 17:30:22 CET 2022


Hi,

FYI, your patch has been queued to stable release 20.11.5

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

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/af3bd943eed8e6f872ce37acd617b1eb41f7a530

Thanks.

Luca Boccassi

---
>From af3bd943eed8e6f872ce37acd617b1eb41f7a530 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1 at huawei.com>
Date: Mon, 28 Feb 2022 11:21:41 +0800
Subject: [PATCH] net/hns3: remove duplicate macro definition

[ upstream commit 0983cdc1870f52a360eadb40eab84b34c20b464d ]

This patch fixes duplicate macro definition of HNS3_RSS_CFG_TBL_SIZE.

Fixes: 737f30e1c3ab ("net/hns3: support command interface with firmware")

Signed-off-by: Jie Hai <haijie1 at huawei.com>
Acked-by: Min Hu (Connor) <humin29 at huawei.com>
---
 drivers/net/hns3/hns3_cmd.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
index 0463acb215..344474db6f 100644
--- a/drivers/net/hns3/hns3_cmd.h
+++ b/drivers/net/hns3/hns3_cmd.h
@@ -557,7 +557,6 @@ struct hns3_cfg_gro_status_cmd {
 
 #define HNS3_RSS_HASH_KEY_OFFSET_B	4
 
-#define HNS3_RSS_CFG_TBL_SIZE	16
 #define HNS3_RSS_HASH_KEY_NUM	16
 /* Configure the algorithm mode and Hash Key, opcode:0x0D01 */
 struct hns3_rss_generic_config_cmd {
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-09 16:30:08.780944960 +0000
+++ 0006-net-hns3-remove-duplicate-macro-definition.patch	2022-03-09 16:30:08.487023811 +0000
@@ -1 +1 @@
-From 0983cdc1870f52a360eadb40eab84b34c20b464d Mon Sep 17 00:00:00 2001
+From af3bd943eed8e6f872ce37acd617b1eb41f7a530 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0983cdc1870f52a360eadb40eab84b34c20b464d ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 81bc9e9d98..f9addc6069 100644
+index 0463acb215..344474db6f 100644
@@ -21 +22 @@
-@@ -603,7 +603,6 @@ struct hns3_cfg_gro_status_cmd {
+@@ -557,7 +557,6 @@ struct hns3_cfg_gro_status_cmd {


More information about the stable mailing list