patch 'net/hns3: fix some error logs' has been queued to stable release 22.11.4

Xueming Li xuemingl at nvidia.com
Mon Dec 11 11:11:03 CET 2023


Hi,

FYI, your patch has been queued to stable release 22.11.4

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

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 555126492becbea6c7d53883cef10015c8c2c98a Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1 at huawei.com>
Date: Tue, 31 Oct 2023 20:23:57 +0800
Subject: [PATCH] net/hns3: fix some error logs
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit fdafdca875eafe36950542cbfbdb21b01b371081 ]

This patch fixes some error log.

Fixes: 62e3ccc2b94c ("net/hns3: support flow control")

Signed-off-by: Jie Hai <haijie1 at huawei.com>
---
 drivers/net/hns3/hns3_dcb.c  | 2 +-
 drivers/net/hns3/hns3_flow.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c
index 07b8c46a81..2831d3dc62 100644
--- a/drivers/net/hns3/hns3_dcb.c
+++ b/drivers/net/hns3/hns3_dcb.c
@@ -1082,7 +1082,7 @@ hns3_dcb_map_cfg(struct hns3_hw *hw)
 
 	ret = hns3_pg_to_pri_map(hw);
 	if (ret) {
-		hns3_err(hw, "pri_to_pg mapping fail: %d", ret);
+		hns3_err(hw, "pg_to_pri mapping fail: %d", ret);
 		return ret;
 	}
 
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index d5c9c22633..da17fa6e69 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -927,7 +927,7 @@ hns3_parse_sctp(const struct rte_flow_item *item, struct hns3_fdir_rule *rule,
 			return rte_flow_error_set(error, EINVAL,
 						  RTE_FLOW_ERROR_TYPE_ITEM_MASK,
 						  item,
-						  "Only support src & dst port in SCTP");
+						  "Only support src & dst port & v-tag in SCTP");
 		if (sctp_mask->hdr.src_port) {
 			hns3_set_bit(rule->input_set, INNER_SRC_PORT, 1);
 			rule->key_conf.mask.src_port =
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-12-11 17:56:24.399635500 +0800
+++ 0038-net-hns3-fix-some-error-logs.patch	2023-12-11 17:56:22.977652300 +0800
@@ -1 +1 @@
-From fdafdca875eafe36950542cbfbdb21b01b371081 Mon Sep 17 00:00:00 2001
+From 555126492becbea6c7d53883cef10015c8c2c98a Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit fdafdca875eafe36950542cbfbdb21b01b371081 ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org
@@ -31 +33 @@
-index a5a7e452d8..7fbe65313c 100644
+index d5c9c22633..da17fa6e69 100644


More information about the stable mailing list