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 37303A034F for ; Wed, 10 Nov 2021 07:48:51 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2EC5840142; Wed, 10 Nov 2021 07:48:51 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2077.outbound.protection.outlook.com [40.107.102.77]) by mails.dpdk.org (Postfix) with ESMTP id 6129640683 for ; Wed, 10 Nov 2021 07:48:49 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WPsQjQ0p6GcTTVB2ZN/B4NQ2KJY2PVMhikzez4CZ73FoF+CkDHEK+HtbKhmxzwO8D7zj4xvCSiUxW2VK3IgqufyUN9+YtFpvNJyFv5QlIIKa39/2onaPrBl+3j6XwxPhcuqIBW6kWl5pMekC0+14A+kn8gA0LCDq+2KPkQfZAwuPIZOrQTUIbFn3++Z1BejBy4Q5WCUjMhfPhv2jE3NWybzfd2/fo+xcRietsAuylH3ogUMDQv/FebocM4vsjAhQ7e9hu/iPdAGf0rwOWkXAalDeLRyK8sDoaYnXoNW5FbxT7yPTFQNUx+K4zV4t53ama4psNRUAT7RbjEmjowqzsQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=aZ42uKg8q/Bk3pKCd07Z0hQezR7GfTBGDGVjOlpEL5w=; b=JD6IE6CVkOSLt83D2GRAZS7PPQlomG5IL9OU5w4cJiKFLp6eEhKrAJI+OVTSZPQEYP830/+eIR1m98h/7cNQHFwnn072fpp6sKOkUGR9mv6ZnmiFYqVEW1eINJMCY9A6ZRWeKKyJj80ob6RyqOW5MVGmPN/Br32CI28Qcby0bnjoyzTtOCUrC95veE/eaCW3yEPVL6I4gGJS3QuWqj440g8ENOo6o92Khb+yOFE+hzjw2LO8tU+CpUs6ggTIgI/T/msv57TPlKQCumOnoWVqzdMoHm+xPDeiVEJdDc6G/IF6mFLU35rvNqOfvzxVL9wd2QAl8DwdCshyvbPlrtwFTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=aZ42uKg8q/Bk3pKCd07Z0hQezR7GfTBGDGVjOlpEL5w=; b=l7BM6OvqLcvAv9n8wUrYiBCgZbprLmTYI7t1KkcUEgJUCZ1YqW4WZUqAitdyLakQPwSCb1Aub3dtzd2lyPjA5L3R5hGABWcUuJ6bhdntPOQUqL2HYWgwO87MWzZbnrI1UL3urz3akXcRqjDIRNSV2z34mYU4jW8EnwUb1jdf5B+qSVuh8S6nde5KtdU0cXpRV4gbKPOjKzxWrXZvy+l3Rc7cT44avCFnYwHFFCNtPbep3eaW6fi2WmfBiVlmDqZ4/9HalPfIdHc16WWahywhRNcnd93U5oHOhxkbY0+C7a4RZ0TA8nxftlf86Wv5F7fni60Phvg+42Eu57zfFmmITw== Received: from BN9P221CA0012.NAMP221.PROD.OUTLOOK.COM (2603:10b6:408:10a::7) by MWHPR12MB1197.namprd12.prod.outlook.com (2603:10b6:300:f::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 06:48:46 +0000 Received: from BN8NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10a:cafe::fd) by BN9P221CA0012.outlook.office365.com (2603:10b6:408:10a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13 via Frontend Transport; Wed, 10 Nov 2021 06:48:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; 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 BN8NAM11FT055.mail.protection.outlook.com (10.13.177.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:48:45 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:48:43 +0000 From: Xueming Li To: Robin Zhang CC: Luca Boccassi , Jesse Brandeburg , Beilei Xing , dpdk stable Date: Wed, 10 Nov 2021 14:30:30 +0800 Message-ID: <20211110063216.2744012-147-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 44b6a97b-0ae2-4080-f9a5-08d9a41624ab X-MS-TrafficTypeDiagnostic: MWHPR12MB1197: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Nvu1QmrU97rJriSVXZD4H5P9o3WXTmkSqWK2cknTOfC5YDUZO8DGN8+TS3c9f4uytzcIpBWpAFeSTpw4bBUkvtq24oYY4kEuADbn3VLQ82mBHXq4T/haertZQ2h1k7//8hWXjyLH0vVAif5QZKijPrY9kmCIUyFa55lIwMbIRPmMQlRWfYQWuKg+CtXR+4nwpnvJeLBECHix3tPAsWfIsxOeBWUD0xhpCEondYIdc/xaYDLA7xGRmw/LUyHPjZ7plVMNWQhSsmzJAFzNQoGH6RlJDxFDu9YXnR7DheIXoiL6Rh2bS32c03H42jBYPGCofj3kwOgiA1amgA14zYCd0rJ4mvvktHWo1+e7c+NdUvhPDWrV4ad833iFVotWkVyKFtPSJCLq+sfWH3/8v2igTcufMK1JhSaKlatWBWboQg02CJHMcSKvGkXlpPTD+8seEb1zjWsX3EWrNNkGsliI60AiHdNVOiBG0bFmxdmo/Lge5xZYrx/dOjd/VPFFX19w2O3s7X5R83r5mg29CJZsJTww2t5JGkI/4wrAAWrj4TybYw6I6qxZ3fA4LuI3MX6uM4XYfHW6fzJ172xSuPz15R4rAi2CF9HLgCZEBOAocgCh1roMsh61TPEoRT9gL/rEQnj+pgO9CBoDoqXeNc/7aAzZbW3ObxlPFiw12fslZZPeB3RfZuxzT9bfO3Uq4D6n7DYwWC/McIuUodO0KCK+SBl57SnohEVTcUgCE8BgWxUKRLAgg/z8zYSXaFyhyDGObOtKGljkWrUI4YS51nH5lzGk0aTflCo4+7fora8Il+kghp0YquMeZ3+BbhCIsKzdabYrCc2aSY+PB+5qycnmdg== 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)(46966006)(36840700001)(316002)(7636003)(82310400003)(6666004)(36756003)(47076005)(83380400001)(54906003)(36906005)(2616005)(2906002)(8676002)(70586007)(966005)(8936002)(70206006)(426003)(6916009)(508600001)(36860700001)(5660300002)(7696005)(4001150100001)(55016002)(1076003)(86362001)(53546011)(186003)(16526019)(4326008)(26005)(6286002)(356005)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:48:45.9502 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 44b6a97b-0ae2-4080-f9a5-08d9a41624ab 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: BN8NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1197 Subject: [dpdk-stable] patch 'net/i40e/base: fix function name in comments' has been queued to stable release 20.11.4 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.4 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/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/088b09d8daf2c7f2a2db6eacaf986d09bc81785a Thanks. Xueming Li --- >From 088b09d8daf2c7f2a2db6eacaf986d09bc81785a Mon Sep 17 00:00:00 2001 From: Robin Zhang Date: Sat, 9 Oct 2021 01:39:49 +0000 Subject: [PATCH] net/i40e/base: fix function name in comments Cc: Xueming Li [ upstream commit bd3c90715b1913b99b9857067fa76985b7fb9224 ] Fix mismatched function name in comments. Fixes: 8db9e2a1b232 ("i40e: base driver") Fixes: 842ea1996335 ("i40e/base: save link module type") Fixes: fd72a2284a89 ("i40e/base: support LED blinking with new PHY") Fixes: 788fc17b2dec ("i40e/base: support proxy config for X722") Signed-off-by: Jesse Brandeburg Signed-off-by: Robin Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_common.c | 10 +++++----- drivers/net/i40e/base/i40e_dcb.c | 2 +- drivers/net/i40e/base/i40e_lan_hmc.c | 2 +- drivers/net/i40e/base/i40e_nvm.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index 657695c5d8..6376e685e4 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -2677,7 +2677,7 @@ enum i40e_status_code i40e_aq_set_vsi_vlan_promisc(struct i40e_hw *hw, } /** - * i40e_get_vsi_params - get VSI configuration info + * i40e_aq_get_vsi_params - get VSI configuration info * @hw: pointer to the hw struct * @vsi_ctx: pointer to a vsi context struct * @cmd_details: pointer to command details structure or NULL @@ -2938,7 +2938,7 @@ enum i40e_status_code i40e_get_link_status(struct i40e_hw *hw, bool *link_up) } /** - * i40e_updatelink_status - update status of the HW network link + * i40e_update_link_info - update status of the HW network link * @hw: pointer to the hw struct **/ enum i40e_status_code i40e_update_link_info(struct i40e_hw *hw) @@ -4723,7 +4723,7 @@ enum i40e_status_code i40e_aq_del_udp_tunnel(struct i40e_hw *hw, u8 index, } /** - * i40e_aq_get_switch_resource_alloc (0x0204) + * i40e_aq_get_switch_resource_alloc - command (0x0204) to get allocations * @hw: pointer to the hw struct * @num_entries: pointer to u8 to store the number of resource entries returned * @buf: pointer to a user supplied buffer. This buffer must be large enough @@ -6870,7 +6870,7 @@ u8 i40e_get_phy_address(struct i40e_hw *hw, u8 dev_num) } /** - * i40e_blink_phy_led + * i40e_blink_phy_link_led * @hw: pointer to the HW structure * @time: time how long led will blinks in secs * @interval: gap between LED on and off in msecs @@ -7717,7 +7717,7 @@ enum i40e_status_code i40e_aq_set_arp_proxy_config(struct i40e_hw *hw, } /** - * i40e_aq_opc_set_ns_proxy_table_entry + * i40e_aq_set_ns_proxy_table_entry * @hw: pointer to the HW structure * @ns_proxy_table_entry: pointer to NS table entry command struct * @cmd_details: pointer to command details diff --git a/drivers/net/i40e/base/i40e_dcb.c b/drivers/net/i40e/base/i40e_dcb.c index 388af3d64d..46add19c9f 100644 --- a/drivers/net/i40e/base/i40e_dcb.c +++ b/drivers/net/i40e/base/i40e_dcb.c @@ -235,7 +235,7 @@ static void i40e_parse_ieee_app_tlv(struct i40e_lldp_org_tlv *tlv, } /** - * i40e_parse_ieee_etsrec_tlv + * i40e_parse_ieee_tlv * @tlv: IEEE 802.1Qaz TLV * @dcbcfg: Local store to update ETS REC data * diff --git a/drivers/net/i40e/base/i40e_lan_hmc.c b/drivers/net/i40e/base/i40e_lan_hmc.c index d3969396f0..d3bd683ff3 100644 --- a/drivers/net/i40e/base/i40e_lan_hmc.c +++ b/drivers/net/i40e/base/i40e_lan_hmc.c @@ -516,7 +516,7 @@ configure_lan_hmc_out: } /** - * i40e_delete_hmc_object - remove hmc objects + * i40e_delete_lan_hmc_object - remove hmc objects * @hw: pointer to the HW structure * @info: pointer to i40e_hmc_delete_obj_info struct * diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c index 561ed21136..67e58cc195 100644 --- a/drivers/net/i40e/base/i40e_nvm.c +++ b/drivers/net/i40e/base/i40e_nvm.c @@ -7,7 +7,7 @@ #include "i40e_prototype.h" /** - * i40e_init_nvm_ops - Initialize NVM function pointers + * i40e_init_nvm - Initialize NVM function pointers * @hw: pointer to the HW structure * * Setup the function pointers and the NVM info structure. Should be called -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:08.432235668 +0800 +++ 0146-net-i40e-base-fix-function-name-in-comments.patch 2021-11-10 14:17:01.934078906 +0800 @@ -1 +1 @@ -From bd3c90715b1913b99b9857067fa76985b7fb9224 Mon Sep 17 00:00:00 2001 +From 088b09d8daf2c7f2a2db6eacaf986d09bc81785a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bd3c90715b1913b99b9857067fa76985b7fb9224 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 2ca6a13e79..baa51e1396 100644 +index 657695c5d8..6376e685e4 100644 @@ -46 +48 @@ -@@ -4830,7 +4830,7 @@ enum i40e_status_code i40e_aq_del_udp_tunnel(struct i40e_hw *hw, u8 index, +@@ -4723,7 +4723,7 @@ enum i40e_status_code i40e_aq_del_udp_tunnel(struct i40e_hw *hw, u8 index, @@ -55 +57 @@ -@@ -6977,7 +6977,7 @@ u8 i40e_get_phy_address(struct i40e_hw *hw, u8 dev_num) +@@ -6870,7 +6870,7 @@ u8 i40e_get_phy_address(struct i40e_hw *hw, u8 dev_num) @@ -64 +66 @@ -@@ -7824,7 +7824,7 @@ enum i40e_status_code i40e_aq_set_arp_proxy_config(struct i40e_hw *hw, +@@ -7717,7 +7717,7 @@ enum i40e_status_code i40e_aq_set_arp_proxy_config(struct i40e_hw *hw, @@ -74 +76 @@ -index 27b52bc365..8f9b7e823f 100644 +index 388af3d64d..46add19c9f 100644