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 6A997A0C3F for ; Sat, 12 Jun 2021 01:07:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6452F4014F; Sat, 12 Jun 2021 01:07:06 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2088.outbound.protection.outlook.com [40.107.220.88]) by mails.dpdk.org (Postfix) with ESMTP id 6E7CE406A2 for ; Sat, 12 Jun 2021 01:07:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DpF4wXPk9jYv35OUBwSNlZGdtfnCtpUnqPv35TQOSh0zJs5azLDycgFd2Zhxyyu0PwE0KwkfgTy35BVAMTMGGQOGu6rwf44uqHsC1fgJUOTowGrLiWUX+RNWnMz7/7Oaw032hX9mlKDwlM5fIShsTs8OpDOsJ+hNGWGWujSvrfPfkX2fGsmaDCo7K4qGJrBgrhwj5dWC+vjcenWa4F+ZZp2SMlfmULDTMEjfo6CR7dZ3mx9if1w0MImaYMqXksTmzjuTvGZq+Wrrxb/zn7rrrzREu5IvY1xgqCzC/eHPEeSpgqFWMhIU/C+qxq77qQ2GBIDDceHAcIhXpTyzVFcxuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z45mJM7Ohu0vquWZ5Gn7FdXPvPm//VmJjnM89BeN5ww=; b=PTZs1Gb1/n7/uYL8Ti0GRaizprW+xpMZoh/YH6lB/XK0CZ7A+Sv20MY+T9tyrcjdncpSc/OISHUdr87hALvRHFnNigEHbr2/eXs7mzyniBOHxAOGHaOAt4psv4SnxOzzWUsV8qUBD+qr9NwLK0YlxEIjdNU49SqDWBF0697CLISjERXiiBJv6+ZCbqUjkwOrmNt7w95aQ5IO74Z/t7EzLfzhFIfje6alEfYnu5mfOvl173jVsNDjvwiKCaiqym/Sq2SZi0Q8fAX/s5S+Q36L2SOb2BnZo0rOywnNnwAzYLdfK2R6XolqB1cKKZ4uJEo7KmEah3+AGabnfGV6JWqUTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z45mJM7Ohu0vquWZ5Gn7FdXPvPm//VmJjnM89BeN5ww=; b=lvfY/VKmxGuSiPkL2hwKm0sLUZ3kT4iVQEVOrwcZ4bqfQ1y8oFoqPYEnkD5StOOhjMgfgCFPVbvjbMTuMta1e6kVvWU5mH0gKWw5f+keD+u8qm1FW3PPswknSSStgIiArtXsvHyDR0NYv7cyG25sZFDscXt7E0ftwsLEmDUyXhvrsYxLFNTlZlKj04gEiIgJSGx+qngI2qjOYQy6IaRjsAL/8FelO8/Bv6/r3zzWwjLO8m7XN9t5ECjxkSkMNVWtSCsEQjBzDChYA0OdcpKIdHB2muN+gWW+8iHmRDgJLuvLrTNfqiEqbYT1TOOQ5hDLsdlIp4hc7wjsSfZxrqjUxQ== Received: from MW4PR03CA0092.namprd03.prod.outlook.com (2603:10b6:303:b7::7) by BY5PR12MB4164.namprd12.prod.outlook.com (2603:10b6:a03:207::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.24; Fri, 11 Jun 2021 23:07:01 +0000 Received: from CO1NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b7:cafe::4f) by MW4PR03CA0092.outlook.office365.com (2603:10b6:303:b7::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:07:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT055.mail.protection.outlook.com (10.13.175.129) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:07:00 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:06:59 +0000 From: Xueming Li To: "Min Hu (Connor)" CC: Luca Boccassi , dpdk stable Date: Sat, 12 Jun 2021 07:01:58 +0800 Message-ID: <20210611230433.8208-24-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8cb4add9-cf28-48de-c694-08d92d2d9eb5 X-MS-TrafficTypeDiagnostic: BY5PR12MB4164: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Co0DIz6nejYqYevHEYRu095xtZ9gdwtY1OqTp07CvcbNHeCGzFuL7Q+doxPfPf4TiD4xnUZJIsIFvTGquog9RRwmaN8qc67jdxl3OPgphjvZennk5bY+2iLk9CCSJ7nE1NmMgVla3k6kqfKTr8lz2E16dt420EnnsRsAmNEEGp8dZ21U/8lvKM3wErsiHFltuVnwT4GKzytnWAwbBu8b9uxOmipYiLtIMAaeUGznLCayx7Tj19QxNX7rdZsKuq51jlKRYuDBf5x2n9KIKQwPKPvJOjcjCAEiYrMcHQBGsc5sp+/5vKpetgKcSHRwoor5x9tGJWGdyNokUpEfpNxp3g7/QuaG/oZ5cUVWuU6EAGJCp3IC9j7F7HMazX2slj55kksSlibF/aYGxi1656gJRcQgpmbnV97Ia2qwtcd17jZeTOQNeoet38vXXtlLRz4/dR6mdc5dBvbBMaRnrRlgb9mYw+bs77W5VgTgyEuiKkg2D4Y7gFGefcJb4tLfXDmms04pfyrlfDgJZ7pk47S8+ZDXdSAMlyh2G+tVZIti6f9/1O7/7HOls59ulfOQdwNrHV2sssHpsrzuZQKKFbBCeIrO8l2CvGP5c+Fwz+h/4F6N2QM+pMoDBC17Bse/FMqQ8t48Y9fWZSgpI9rTTQDccM3xPbsg2dbNeOZoxlda0fieHT8NUaxxehGsV+yml7OH5WGv7jygo302LVeZFZE/Uicwz2JRUnxHvq+Rkx9IlZQiRWqXHAzXVO5/khQ3G1Fe857/kJ1n52yxJZ/jWvr+0ItdNJQbF+lfoAFYy/hapkwX9//zlTmWfV44L3cL2W7e X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(376002)(396003)(136003)(346002)(39860400002)(46966006)(36840700001)(8936002)(336012)(55016002)(6286002)(82310400003)(966005)(2906002)(426003)(8676002)(82740400003)(5660300002)(356005)(54906003)(7636003)(316002)(4326008)(36756003)(53546011)(7696005)(2616005)(1076003)(186003)(26005)(16526019)(36860700001)(478600001)(70206006)(83380400001)(6916009)(36906005)(70586007)(86362001)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:07:00.7857 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8cb4add9-cf28-48de-c694-08d92d2d9eb5 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4164 Subject: [dpdk-stable] patch 'net/hns3: fix typos on comments' has been queued to stable release 20.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/bef47e0c78c3c3f84629eb0c17c914a45dfc9614 Thanks. Xueming Li --- >From bef47e0c78c3c3f84629eb0c17c914a45dfc9614 Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Fri, 23 Apr 2021 17:27:38 +0800 Subject: [PATCH] net/hns3: fix typos on comments Cc: Luca Boccassi [ upstream commit db94014c4c6084d4797b514c6d0f517cdd546076 ] This patch fixed wrong word in comments. Fixes: f53a793bb7c2 ("net/hns3: add more hardware error types") Fixes: d51867db65c1 ("net/hns3: add initialization") Fixes: 411d23b9eafb ("net/hns3: support VLAN") Fixes: 5f8845f4ba8f ("net/hns3: process MAC interrupt") Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 6e1d7891e9..8e4692385d 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -377,7 +377,7 @@ hns3_vlan_filter_configure(struct hns3_adapter *hns, uint16_t vlan_id, int on) * When port base vlan enabled, we use port base vlan as the vlan * filter condition. In this case, we don't update vlan filter table * when user add new vlan or remove exist vlan, just update the - * vlan list. The vlan id in vlan list will be writen in vlan filter + * vlan list. The vlan id in vlan list will be written in vlan filter * table until port base vlan disabled */ if (hw->port_base_vlan_cfg.state == HNS3_PORT_BASE_VLAN_DISABLE) { @@ -3759,8 +3759,8 @@ hns3_rx_buffer_calc(struct hns3_hw *hw, struct hns3_pkt_buf_alloc *buf_alloc) * For different application scenes, the enabled port number, TC number * and no_drop TC number are different. In order to obtain the better * performance, software could allocate the buffer size and configure - * the waterline by tring to decrease the private buffer size according - * to the order, namely, waterline of valided tc, pfc disabled tc, pfc + * the waterline by trying to decrease the private buffer size according + * to the order, namely, waterline of valid tc, pfc disabled tc, pfc * enabled tc. */ if (hns3_rx_buf_calc_all(hw, false, buf_alloc)) @@ -4708,7 +4708,7 @@ hns3_config_all_msix_error(struct hns3_hw *hw, bool enable) * and belong to a different type from the MSI-x errors processed * by the network driver. * - * Network driver should open the new error report on initialition + * Network driver should open the new error report on initialization. */ val = hns3_read_dev(hw, HNS3_VECTOR0_OTER_EN_REG); hns3_set_bit(val, HNS3_VECTOR0_ALL_MSIX_ERR_B, enable ? 1 : 0); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:57.317366500 +0800 +++ 0024-net-hns3-fix-typos-on-comments.patch 2021-06-12 06:53:56.120000000 +0800 @@ -1 +1 @@ -From db94014c4c6084d4797b514c6d0f517cdd546076 Mon Sep 17 00:00:00 2001 +From bef47e0c78c3c3f84629eb0c17c914a45dfc9614 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit db94014c4c6084d4797b514c6d0f517cdd546076 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -16,2 +18,2 @@ - drivers/net/hns3/hns3_ethdev.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + drivers/net/hns3/hns3_ethdev.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) @@ -20 +22 @@ -index bd0699af58..ab38eae127 100644 +index 6e1d7891e9..8e4692385d 100644 @@ -23,10 +25 @@ -@@ -280,7 +280,7 @@ hns3_handle_mac_tnl(struct hns3_hw *hw) - uint32_t status; - int ret; - -- /* query and clear mac tnl interruptions */ -+ /* query and clear mac tnl interrupt */ - hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_QUERY_MAC_TNL_INT, true); - ret = hns3_cmd_send(hw, &desc, 1); - if (ret) { -@@ -462,7 +462,7 @@ hns3_vlan_filter_configure(struct hns3_adapter *hns, uint16_t vlan_id, int on) +@@ -377,7 +377,7 @@ hns3_vlan_filter_configure(struct hns3_adapter *hns, uint16_t vlan_id, int on) @@ -41 +34 @@ -@@ -3986,8 +3986,8 @@ hns3_rx_buffer_calc(struct hns3_hw *hw, struct hns3_pkt_buf_alloc *buf_alloc) +@@ -3759,8 +3759,8 @@ hns3_rx_buffer_calc(struct hns3_hw *hw, struct hns3_pkt_buf_alloc *buf_alloc) @@ -52 +45 @@ -@@ -5048,7 +5048,7 @@ hns3_config_all_msix_error(struct hns3_hw *hw, bool enable) +@@ -4708,7 +4708,7 @@ hns3_config_all_msix_error(struct hns3_hw *hw, bool enable)