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 1E3EBA0C4C for ; Mon, 12 Jul 2021 15:13:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1862C40685; Mon, 12 Jul 2021 15:13:26 +0200 (CEST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 0077B41177 for ; Mon, 12 Jul 2021 15:13:24 +0200 (CEST) Received: by mail-wm1-f50.google.com with SMTP id l4-20020a05600c4f04b0290220f8455631so3878618wmq.1 for ; Mon, 12 Jul 2021 06:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=obKksOpFlvwbhARFzUnTzPn9bvYJJYWVqPG0i6oUZew=; b=UcWMRSog50+8jlIXueToosFiVoYgelcmJiBFgwzJntyHYCrzsLxoM4ZXWQXNI7s7al arU9TDK5Mf/EG85se5JhFd4f/ETrjOb364U1EEI2ZapEkMw/okEmvD9a9ttjzMvvZ0/Z 4Egmi3yTfmCSte80tLL37pHKGNbizEIhD8yihYO9NL/1A13moW0mpEwg+xRmriAOmJsZ KwkLY4KhuAknY8ecdHyt4XFGFPVBfeujiVw/4YGK0gBUk8fzdXFtGrPABHSiCXNJ7aRw 04ybH7ZC022xXyCV3yIlHNVpUKUwthgs22ius/rOeC/y3QxJsl1unUVnrUK0ZqbftrcF pvKg== 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=obKksOpFlvwbhARFzUnTzPn9bvYJJYWVqPG0i6oUZew=; b=bhojjjiAqCWT1ACacPGilMJghh88IvX7FY2ouhBULAHsnJdCnfuE9olAT9ufG80kgl OmavOvO3/tNYTTf2toPtsCA8QlrsuSH69NN2R6DHqEZ0ahkPzIcLp+2+0c6yxX8j6xW7 rJ3uYAsIAo/YUlM/JC67WUvfQc8eZLfelMQ5VTgQjil1TBoCf89JTPTtO3opq4isND4V cAUPr2s+L6U3/zm6tfq35WQrxWOSkTwxY5lKkNE47a4U64jghXmBoTAdvBkXKjYPrRAT K5qA9tmptuUf7I1HByULF3ApcUHTh/8iVG/VqrrfwCKikB3gP5JEK9UGoi/1s8clGvL7 /9lw== X-Gm-Message-State: AOAM532UVpwo0+Z0SxFXu7UEF2DHAMnVbi+p9a5FfwboKaCXCRkBRRvN uBACcqdEUZKaXDWITVWbg2U= X-Google-Smtp-Source: ABdhPJzNnwd6FbmL02D6yiWXIK4q7T0Q26OMGHkuiyn4HjOt022e+4d8YaZxqZFTOULRtqwms9LFrQ== X-Received: by 2002:a1c:ed10:: with SMTP id l16mr14338601wmh.8.1626095604800; Mon, 12 Jul 2021 06:13:24 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id m18sm12077804wmq.45.2021.07.12.06.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:13:24 -0700 (PDT) From: luca.boccassi@gmail.com To: Chengchang Tang Cc: Min Hu , dpdk stable Date: Mon, 12 Jul 2021 14:04:58 +0100 Message-Id: <20210712130551.2462159-63-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.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 20.11.3 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 20.11.3 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/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/fc750680d70738c036125e9d4537f59be6cb3494 Thanks. Luca Boccassi --- >From fc750680d70738c036125e9d4537f59be6cb3494 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 5f897fed39..0079b56367 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -558,7 +558,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 2959d81a71..04b28a3a21 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -1499,7 +1499,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:39.954809252 +0100 +++ 0063-net-hns3-fix-VLAN-strip-log.patch 2021-07-12 13:41:36.542123694 +0100 @@ -1 +1 @@ -From d8c497c55a3b13a0ec6ef8614af0ced46c372eb9 Mon Sep 17 00:00:00 2001 +From fc750680d70738c036125e9d4537f59be6cb3494 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 5f897fed39..0079b56367 100644 @@ -23 +24 @@ -@@ -640,7 +640,8 @@ hns3_en_hw_strip_rxvtag(struct hns3_adapter *hns, bool enable) +@@ -558,7 +558,8 @@ hns3_en_hw_strip_rxvtag(struct hns3_adapter *hns, bool enable) @@ -34 +35 @@ -index 74f93dcb15..c5f320fc5b 100644 +index 2959d81a71..04b28a3a21 100644 @@ -37 +38 @@ -@@ -1606,7 +1606,8 @@ hns3vf_en_hw_strip_rxvtag(struct hns3_hw *hw, bool enable) +@@ -1499,7 +1499,8 @@ hns3vf_en_hw_strip_rxvtag(struct hns3_hw *hw, bool enable)