patch 'net/bnxt: remove unused macro' has been queued to stable release 19.11.13

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Thu Jul 7 09:54:17 CEST 2022


Hi,

FYI, your patch has been queued to stable release 19.11.13

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

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

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From fd3e0ac14cef10dbee29e4980ee81d92778b1824 Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Wed, 27 Apr 2022 20:28:07 +0530
Subject: [PATCH] net/bnxt: remove unused macro

[ upstream commit c29aa80fb54addbda9a5c841472d7584d3ab9108 ]

BNXT_FLAG_UPDATE_HASH is redundant now, remove it.

Fixes: 1ebb765090a6 ("net/bnxt: fix config RSS update")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
---
 drivers/net/bnxt/bnxt.h        | 1 -
 drivers/net/bnxt/bnxt_ethdev.c | 2 --
 drivers/net/bnxt/bnxt_rxq.c    | 3 ---
 3 files changed, 6 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index fd362524b3..5ddf60313d 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -549,7 +549,6 @@ struct bnxt {
 #define BNXT_FLAG_PORT_STATS		BIT(2)
 #define BNXT_FLAG_JUMBO			BIT(3)
 #define BNXT_FLAG_SHORT_CMD		BIT(4)
-#define BNXT_FLAG_UPDATE_HASH		BIT(5)
 #define BNXT_FLAG_PTP_SUPPORTED		BIT(6)
 #define BNXT_FLAG_MULTI_HOST    	BIT(7)
 #define BNXT_FLAG_EXT_RX_PORT_STATS	BIT(8)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 5994a33944..f51812f148 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1587,8 +1587,6 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
 			return -EINVAL;
 	}
 
-	bp->flags |= BNXT_FLAG_UPDATE_HASH;
-
 	/* Update the default RSS VNIC(s) */
 	vnic = &bp->vnic_info[0];
 	vnic->hash_type = bnxt_rte_to_hwrm_hash_types(rss_conf->rss_hf);
diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 993219a2a6..9d8efe0185 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -139,9 +139,6 @@ skip_filter_allocation:
 	if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {
 		struct rte_eth_rss_conf *rss = &bp->rss_conf;
 
-		if (bp->flags & BNXT_FLAG_UPDATE_HASH)
-			bp->flags &= ~BNXT_FLAG_UPDATE_HASH;
-
 		for (i = 0; i < bp->nr_vnics; i++) {
 			vnic = &bp->vnic_info[i];
 			vnic->hash_type =
-- 
2.37.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-07 09:54:12.157151387 +0200
+++ 0022-net-bnxt-remove-unused-macro.patch	2022-07-07 09:54:10.833823802 +0200
@@ -1 +1 @@
-From c29aa80fb54addbda9a5c841472d7584d3ab9108 Mon Sep 17 00:00:00 2001
+From fd3e0ac14cef10dbee29e4980ee81d92778b1824 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c29aa80fb54addbda9a5c841472d7584d3ab9108 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 5eddb4f000..9e5ff7496e 100644
+index fd362524b3..5ddf60313d 100644
@@ -24 +25 @@
-@@ -648,7 +648,6 @@ struct bnxt {
+@@ -549,7 +549,6 @@ struct bnxt {
@@ -33 +34 @@
-index fac3925469..181de42d15 100644
+index 5994a33944..f51812f148 100644
@@ -36 +37 @@
-@@ -2125,8 +2125,6 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
+@@ -1587,8 +1587,6 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
@@ -43 +44 @@
- 	vnic = BNXT_GET_DEFAULT_VNIC(bp);
+ 	vnic = &bp->vnic_info[0];
@@ -46 +47 @@
-index 0cfd0e588f..3c2283b8c6 100644
+index 993219a2a6..9d8efe0185 100644
@@ -49,2 +50,2 @@
-@@ -175,9 +175,6 @@ skip_filter_allocation:
- 	if (dev_conf->rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) {
+@@ -139,9 +139,6 @@ skip_filter_allocation:
+ 	if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {
@@ -57,2 +58,2 @@
- 			uint32_t lvl = RTE_ETH_RSS_LEVEL(rss->rss_hf);
- 
+ 			vnic = &bp->vnic_info[i];
+ 			vnic->hash_type =


More information about the stable mailing list