From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8A5C243345 for ; Thu, 16 Nov 2023 14:24:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8425740A7D; Thu, 16 Nov 2023 14:24:36 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 05DAA402C6 for ; Thu, 16 Nov 2023 14:24:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DqFS7i2+bGZ2qWeZk0Vsj7noH006Prd7kCqdHl5BiYo=; b=DlkTdt5bcJzUKup9+3uyjzGGzt4zz4828xhcm6TS3lAWGB/wqZtaR27UHG19hw7O7tG7UB KnesEWaSA3/071Xs3Dqaj99Ifl5efXUfZpS+vsPjKAoYnyMRv29X6hu5opm21+HDiIZaRG OK+nDDF1kSnezdbEq+iKz276PYBIE88= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-295-hs2VK9WdMbWaEAmGFJzVMA-1; Thu, 16 Nov 2023 08:24:31 -0500 X-MC-Unique: hs2VK9WdMbWaEAmGFJzVMA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 28CAC811E7E; Thu, 16 Nov 2023 13:24:31 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C50C2166B27; Thu, 16 Nov 2023 13:24:30 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: dpdk stable Subject: patch 'net/hns3: fix some error logs' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:05 +0000 Message-ID: <20231116132348.557257-23-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/5c52c7e6a40bd9c05bf3bd4637f4e72173220647 Thanks. Kevin --- >From 5c52c7e6a40bd9c05bf3bd4637f4e72173220647 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Tue, 31 Oct 2023 20:23:57 +0800 Subject: [PATCH] net/hns3: fix some error logs [ upstream commit fdafdca875eafe36950542cbfbdb21b01b371081 ] This patch fixes some error log. Fixes: 62e3ccc2b94c ("net/hns3: support flow control") Signed-off-by: Jie Hai --- 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 0360dc3862..1a156cca7e 100644 --- a/drivers/net/hns3/hns3_dcb.c +++ b/drivers/net/hns3/hns3_dcb.c @@ -1094,5 +1094,5 @@ 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 b0d0a849c2..74b08451e1 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -881,5 +881,5 @@ hns3_parse_sctp(const struct rte_flow_item *item, struct hns3_fdir_rule *rule, 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); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.116254516 +0000 +++ 0023-net-hns3-fix-some-error-logs.patch 2023-11-16 13:21:52.448946369 +0000 @@ -1 +1 @@ -From fdafdca875eafe36950542cbfbdb21b01b371081 Mon Sep 17 00:00:00 2001 +From 5c52c7e6a40bd9c05bf3bd4637f4e72173220647 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fdafdca875eafe36950542cbfbdb21b01b371081 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 07b8c46a81..2831d3dc62 100644 +index 0360dc3862..1a156cca7e 100644 @@ -21 +22 @@ -@@ -1083,5 +1083,5 @@ hns3_dcb_map_cfg(struct hns3_hw *hw) +@@ -1094,5 +1094,5 @@ hns3_dcb_map_cfg(struct hns3_hw *hw) @@ -29 +30 @@ -index a5a7e452d8..7fbe65313c 100644 +index b0d0a849c2..74b08451e1 100644 @@ -32 +33 @@ -@@ -928,5 +928,5 @@ hns3_parse_sctp(const struct rte_flow_item *item, struct hns3_fdir_rule *rule, +@@ -881,5 +881,5 @@ hns3_parse_sctp(const struct rte_flow_item *item, struct hns3_fdir_rule *rule,