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 955BC432DA for ; Wed, 8 Nov 2023 20:26:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F35942E28; Wed, 8 Nov 2023 20:26:45 +0100 (CET) Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by mails.dpdk.org (Postfix) with ESMTP id 11DF840395 for ; Wed, 8 Nov 2023 20:26:44 +0100 (CET) Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-509109104e2so14256e87.3 for ; Wed, 08 Nov 2023 11:26:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699471603; x=1700076403; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=K16PZKB9grLAk4iRlXViHoznmIBIADYx5tzSoikvPsg=; b=EHt6DVbJmnuyBCcN02HiHkvn59FwBmJxdfCl4pAM4zsgc0g1CYbZ02lfQJdCT/KMho 4C3IP0LDr0ndvQ4KzkeNFSRYJf4PYDHx2qj5E2PGpM/n4BbaxNMRNiX5Bzuuyqd27tzg aW78eDE6cliIL9Hakkfop9ba0kIQYg0gjbpuYL2r2LI1mak45ADP6Yl73yJAHZYO35DM yp6d37OaZViTLCSoyPHZsVkn5ZcwqFSdeCRAQxPTqUBw5rx32B+huLBRKi/FijCf4yt5 Tjbb7Xka1R+HNqfsBoM6Fsk/XY18xkqF0HZQTs9j+NFKCbNue/UTHwHM9OHPIqAPWyUH ITiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699471603; x=1700076403; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K16PZKB9grLAk4iRlXViHoznmIBIADYx5tzSoikvPsg=; b=QbzQx3BgkdHyRYsDvYsTmT/+OUHHWYeMy1aDIgZPJfdHgqMLuVMfBSo6ge4v0Mot+K wE2a4uSMez/O1R3gf7j04oLIBNo1nO3gbaO5Pf/xXKPqCiE3bZ0g6JFuFg/5IuIyGunG UUT2Fx/WapE2DcT5OOuF8+zmasXMXzpoqBqhErXshullLdreJORfzXV+T8oOOHbQmgKz U3jd7HwMLbA0dvfsBlBZZ5F2JzXbApAxyOu9ERXXurAoCfU0U6RxvmDgsk7DLIGAFbde KtFu0vLzHHJPGc2JxlgHrtVWi7qXu30xRZCH2VVGmf+HYyuk2kiUYowIkK4sKijZ0H5/ 6X/Q== X-Gm-Message-State: AOJu0Ywpo22g1HBo6Ghxfq9SHr0TVRToLv/w7/VadFyuL1DFaX+47ySo as2lFGroRz8LI5hUY7nJSNkxA8r7DZw9pw== X-Google-Smtp-Source: AGHT+IE7lkOHXXz6gCWQozhYy41Bf2S+YsU0kySwePWTVCMZH1TNAws0sA/DkTMjRvcx8nbCGphGEQ== X-Received: by 2002:a05:6512:3b27:b0:509:43d7:dd37 with SMTP id f39-20020a0565123b2700b0050943d7dd37mr2822046lfv.48.1699471603317; Wed, 08 Nov 2023 11:26:43 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id o3-20020a056000010300b0032da4f70756sm5669798wrx.5.2023.11.08.11.26.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 11:26:42 -0800 (PST) From: luca.boccassi@gmail.com To: Jie Hai Cc: dpdk stable Subject: patch 'net/hns3: fix some error logs' has been queued to stable release 20.11.10 Date: Wed, 8 Nov 2023 19:25:20 +0000 Message-Id: <20231108192535.922238-22-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231108192535.922238-1-luca.boccassi@gmail.com> References: <20231018235930.3144-41-luca.boccassi@gmail.com> <20231108192535.922238-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.10 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/10/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/45ed930d5ad9eb823a936ed2210aa7a2f5775ef1 Thanks. Luca Boccassi --- >From 45ed930d5ad9eb823a936ed2210aa7a2f5775ef1 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 6f9335a41f..31c5c460f2 100644 --- a/drivers/net/hns3/hns3_dcb.c +++ b/drivers/net/hns3/hns3_dcb.c @@ -1051,7 +1051,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 79910ff982..2f49b47151 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -907,7 +907,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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-08 19:23:53.080646025 +0000 +++ 0022-net-hns3-fix-some-error-logs.patch 2023-11-08 19:23:51.801396872 +0000 @@ -1 +1 @@ -From fdafdca875eafe36950542cbfbdb21b01b371081 Mon Sep 17 00:00:00 2001 +From 45ed930d5ad9eb823a936ed2210aa7a2f5775ef1 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 6f9335a41f..31c5c460f2 100644 @@ -21 +22 @@ -@@ -1082,7 +1082,7 @@ hns3_dcb_map_cfg(struct hns3_hw *hw) +@@ -1051,7 +1051,7 @@ hns3_dcb_map_cfg(struct hns3_hw *hw) @@ -31 +32 @@ -index a5a7e452d8..7fbe65313c 100644 +index 79910ff982..2f49b47151 100644 @@ -34 +35 @@ -@@ -927,7 +927,7 @@ hns3_parse_sctp(const struct rte_flow_item *item, struct hns3_fdir_rule *rule, +@@ -907,7 +907,7 @@ hns3_parse_sctp(const struct rte_flow_item *item, struct hns3_fdir_rule *rule,