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 9FB83A0C47 for ; Tue, 10 Aug 2021 17:42:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9859A4014F; Tue, 10 Aug 2021 17:42:10 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 4A7A94014F for ; Tue, 10 Aug 2021 17:42:09 +0200 (CEST) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (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 smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id 2EFB43F047 for ; Tue, 10 Aug 2021 15:42:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610129; bh=hV7ZIVfWuEN3oZbIChoGkmJMN3Mg30YuRtVlfzOtPfw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GgBLh3jizjDANwVz+BS30188Oc5CMIGTAzepcCjGUZnzq6ORHHOANPC4PVqC0y8bp isUhPNSe6k7EFpAFKTn4Mr7Vh37uhk+/oGNMjud87umSBQ6dgeYfEEhWyMoxPsyN/l 0UqeWSvXdLIw2mwg+sOgeboLJKAJtwxu4z+CWWb0YdXOEGr41nv2OdRG9NMu3Pq93b 7P8/DBm0Eq9klVQVewlBZnoi1/colihiehXMB9qbYBg73MeLU0GRv+rmc5XDZa76lB hiV3e+LeH6rTn+AyWC9VBeKOjqgKc8H8/xwtEztZWhc4tctkG8iCCvHz1gfPxO1ZQp aAdy14WP98PhA== Received: by mail-ej1-f69.google.com with SMTP id h13-20020a1709062dcdb02905aec576a827so2126428eji.23 for ; Tue, 10 Aug 2021 08:42:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hV7ZIVfWuEN3oZbIChoGkmJMN3Mg30YuRtVlfzOtPfw=; b=SJTCQoJArI9KtdDs8soHxCppNAbzbfpGvIuP7DKrxEW7XVR+DVdDVH0vC45I4Tikru XyRZ0m5WjHkt9NeS5UG32wMOUdkLPFEL9u3e6RYofSF+WL/FlzJvyNMQl3wKhvt8I5jS SGnicrJexs/lgx66BXRo7/+bFy5GDiW+F/hCk8D1Ll5kELUQku789fMMGaqL/TUIj8Ah 8LC7/ztQnjmGzLuilECd/PJgM1jmeSKYKFiPPsvbOhsqTKApq/TJHnJo2Z2In8SSq/SP A7ST+/L/SWO0Dl+kH7e8OPk1i5OH/NBOcRFQTUY4ougOhx9DWVlf2LNfuMvhVfuYORjJ OrgQ== X-Gm-Message-State: AOAM533L7l7iwc/odushKMpx7C0yB691OAuoTAn+YdE4JYRl8NcvF6b8 oqUA2oQFAQTLPIBuEBhwxlOTSXdGYnY73SqxoX1v1C6XkK5mzbuNKXJLe9ShDRKDuqqHplKMJXs YATnR7MPvyP3Ttn+cFyknCPsb X-Received: by 2002:a17:906:d20b:: with SMTP id w11mr28694046ejz.242.1628610128720; Tue, 10 Aug 2021 08:42:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztSSZJSOinjDy5iVdKj36R2OumMhSrIaSAa0XP+nCz/tUIMQCoph3zZgLrUK/8/MHAaGy7MA== X-Received: by 2002:a17:906:d20b:: with SMTP id w11mr28694027ejz.242.1628610128452; Tue, 10 Aug 2021 08:42:08 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id q8sm9596911edv.95.2021.08.10.08.42.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:42:08 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Chengchang Tang Cc: Min Hu , dpdk stable Date: Tue, 10 Aug 2021 17:39:12 +0200 Message-Id: <20210810154022.749358-32-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix VLAN strip log' has been queued to stable release 19.11.10 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 08/12/21. 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/55d20504dec8569755be0aeb6948513ae23ba690 Thanks. Christian Ehrhardt --- >From 55d20504dec8569755be0aeb6948513ae23ba690 Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Sun, 13 Jun 2021 10:31:54 +0800 Subject: [PATCH] net/hns3: fix VLAN strip log [ upstream commit d8c497c55a3b13a0ec6ef8614af0ced46c372eb9 ] When the current VLAN stripping is set, the log print always prompts that the enabling fails, bug if may actually be the disabling failure. Fixes: 411d23b9eafb ("net/hns3: support VLAN") Signed-off-by: Chengchang Tang Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev.c | 3 ++- drivers/net/hns3/hns3_ethdev_vf.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index e1bc55682c..96e7faf2ce 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -523,7 +523,8 @@ hns3_en_hw_strip_rxvtag(struct hns3_adapter *hns, bool enable) ret = hns3_set_vlan_rx_offload_cfg(hns, &rxvlan_cfg); if (ret) { - hns3_err(hw, "enable strip rx vtag failed, ret =%d", ret); + hns3_err(hw, "%s strip rx vtag failed, ret = %d.", + enable ? "enable" : "disable", ret); return ret; } diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index eb3edf3464..e63704429c 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -1194,7 +1194,8 @@ hns3vf_en_hw_strip_rxvtag(struct hns3_hw *hw, bool enable) ret = hns3_send_mbx_msg(hw, HNS3_MBX_SET_VLAN, HNS3_MBX_VLAN_RX_OFF_CFG, &msg_data, sizeof(msg_data), false, NULL, 0); if (ret) - hns3_err(hw, "vf enable strip failed, ret =%d", ret); + hns3_err(hw, "vf %s strip failed, ret = %d.", + enable ? "enable" : "disable", ret); return ret; } -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:14.304151600 +0200 +++ 0032-net-hns3-fix-VLAN-strip-log.patch 2021-08-10 15:11:12.970637754 +0200 @@ -1 +1 @@ -From d8c497c55a3b13a0ec6ef8614af0ced46c372eb9 Mon Sep 17 00:00:00 2001 +From 55d20504dec8569755be0aeb6948513ae23ba690 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d8c497c55a3b13a0ec6ef8614af0ced46c372eb9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index ad25aa69d7..ff219b8b52 100644 +index e1bc55682c..96e7faf2ce 100644 @@ -23 +24 @@ -@@ -640,7 +640,8 @@ hns3_en_hw_strip_rxvtag(struct hns3_adapter *hns, bool enable) +@@ -523,7 +523,8 @@ hns3_en_hw_strip_rxvtag(struct hns3_adapter *hns, bool enable) @@ -34 +35 @@ -index 74f93dcb15..c5f320fc5b 100644 +index eb3edf3464..e63704429c 100644 @@ -37 +38 @@ -@@ -1606,7 +1606,8 @@ hns3vf_en_hw_strip_rxvtag(struct hns3_hw *hw, bool enable) +@@ -1194,7 +1194,8 @@ hns3vf_en_hw_strip_rxvtag(struct hns3_hw *hw, bool enable)