diff mbox series

[06/12] net/hns3: remove duplicate definition

Message ID	20220519122917.2334-7-humin29@huawei.com (mailing list archive)
State	Changes Requested, archived
Delegated to:	Andrew Rybchenko
Headers	From: "Min Hu (Connor)" <humin29@huawei.com> To: <dev@dpdk.org> CC: <ferruh.yigit@intel.com>, <thomas@monjalon.net> Subject: [PATCH 06/12] net/hns3: remove duplicate definition Date: Thu, 19 May 2022 20:29:11 +0800 Message-ID: <20220519122917.2334-7-humin29@huawei.com> In-Reply-To: <20220519122917.2334-1-humin29@huawei.com> References: <20220519122917.2334-1-humin29@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: list Errors-To: dev-bounces@dpdk.org
Series	bugfix for hns3 PMD \| [00/12] bugfix for hns3 PMD [01/12] net/hns3: fix spelling errors [02/12] net/hns3: add check for deferred start queue when rollback [03/12] net/hns3: remove redundant parentheses [04/12] net/hns3: adjust the data type of some variables [05/12] net/hns3: fix an unreasonable memset [06/12] net/hns3: remove duplicate definition [07/12] net/hns3: fix coverity codecheck [08/12] net/hns3: fix return value for unsupported tuple [09/12] net/hns3: modify a function name [10/12] net/hns3: unify the code wrap style [11/12] net/hns3: fix a segfault from secondary process [12/12] net/hns3: fix TM capability incorrectly defined

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

humin (Q) May 19, 2022, 12:29 p.m. UTC

  From: Huisong Li <lihuisong@huawei.com>

The default hash key array is defined twice. Let's remove the extra one.

Fixes: c37ca66f2b27 ("net/hns3: support RSS")
Cc: stable@dpdk.org

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
---
 drivers/net/hns3/hns3_flow.c | 9 ---------
 drivers/net/hns3/hns3_rss.c  | 6 ++----
 drivers/net/hns3/hns3_rss.h  | 2 ++
 3 files changed, 4 insertions(+), 13 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 12afc24910..e994cac314 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -10,15 +10,6 @@ 
 #include "hns3_logs.h"
 #include "hns3_flow.h"
 
-/* Default default keys */
-static uint8_t hns3_hash_key[] = {
-	0x6D, 0x5A, 0x56, 0xDA, 0x25, 0x5B, 0x0E, 0xC2,
-	0x41, 0x67, 0x25, 0x3D, 0x43, 0xA3, 0x8F, 0xB0,
-	0xD0, 0xCA, 0x2B, 0xCB, 0xAE, 0x7B, 0x30, 0xB4,
-	0x77, 0xCB, 0x2D, 0xA3, 0x80, 0x30, 0xF2, 0x0C,
-	0x6A, 0x42, 0xB7, 0x3B, 0xBE, 0xAC, 0x01, 0xFA
-};
-
 static const uint8_t full_mask[VNI_OR_TNI_LEN] = { 0xFF, 0xFF, 0xFF };
 static const uint8_t zero_mask[VNI_OR_TNI_LEN] = { 0x00, 0x00, 0x00 };
 
diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c
index 4c546c9363..1003daf03e 100644
--- a/drivers/net/hns3/hns3_rss.c
+++ b/drivers/net/hns3/hns3_rss.c
@@ -9,10 +9,8 @@ 
 #include "hns3_ethdev.h"
 #include "hns3_logs.h"
 
-/*
- * The hash key used for rss initialization.
- */
-static const uint8_t hns3_hash_key[] = {
+/* Default hash keys */
+const uint8_t hns3_hash_key[] = {
 	0x6D, 0x5A, 0x56, 0xDA, 0x25, 0x5B, 0x0E, 0xC2,
 	0x41, 0x67, 0x25, 0x3D, 0x43, 0xA3, 0x8F, 0xB0,
 	0xD0, 0xCA, 0x2B, 0xCB, 0xAE, 0x7B, 0x30, 0xB4,
diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h
index 7789f02a08..5b90d3a628 100644
--- a/drivers/net/hns3/hns3_rss.h
+++ b/drivers/net/hns3/hns3_rss.h
@@ -88,6 +88,8 @@  static inline uint32_t roundup_pow_of_two(uint32_t x)
 	return 1UL << fls(x - 1);
 }
 
+extern const uint8_t hns3_hash_key[];
+
 struct hns3_adapter;
 
 int hns3_dev_rss_hash_update(struct rte_eth_dev *dev,