From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5A6B1E25E1; Wed, 30 Jul 2025 09:51:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753869115; cv=none; b=lF7qVSruF88ACh5FuezYaLrMtJxF6R/a9kXbCJW4PEE340Gvxg7C6xtu+dczifYpNdumu2WYEte3p8U0uWft2ge+1ZVx2eosbzKrokqS2ZMsMzVInRu7by1/HqheGeS1w8hy8ueCJuprQ/jn0Hj+jxF0Fhmtnh/uEBtm+bHDTlY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753869115; c=relaxed/simple; bh=3fU16fAo9bIdYZnZCkp/q1AB496t7dZAN3b/T4ql7aU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JH2WD8ySsZ2QZRQpopE9Fd18cOeS7TFQt1AFC/WmDtSnM0sFF+20BLI9gPtuTgEGim96T5tO2lCOKZoP4+QSs0xMhZ1urVFrrpr4ITnrA3h4VBjyLleSvHOMCchaPjCeyeZlFkMI2zWMO6PGEKcw3K49HUM2fCzMtrDBVDPCWvM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0IwfQIZo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0IwfQIZo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0671FC4CEF5; Wed, 30 Jul 2025 09:51:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1753869114; bh=3fU16fAo9bIdYZnZCkp/q1AB496t7dZAN3b/T4ql7aU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0IwfQIZoVx4Ky/iq/N9UfAI6oMM9JN3EfgP7+4UuThEB/4Gk6T9I+JGhp3llIyh63 ym0XzgS6gXPyz7nehWpfz/gl8CQnUvWphyx9JmSCTtF62hVz0aTVjrllXvJcr2JJwm wNBWUrcYFBo/JUWTvywIzLHr1VLY37cSwpkLeyDs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jian Shen , Hao Lan , Jijie Shao , Simon Horman , Paolo Abeni , Sasha Levin Subject: [PATCH 6.15 41/92] net: hns3: fixed vf get max channels bug Date: Wed, 30 Jul 2025 11:35:49 +0200 Message-ID: <20250730093232.358383178@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250730093230.629234025@linuxfoundation.org> References: <20250730093230.629234025@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jian Shen [ Upstream commit b3e75c0bcc53f647311960bc1b0970b9b480ca5a ] Currently, the queried maximum of vf channels is the maximum of channels supported by each TC. However, the actual maximum of channels is the maximum of channels supported by the device. Fixes: 849e46077689 ("net: hns3: add ethtool_ops.get_channels support for VF") Signed-off-by: Jian Shen Signed-off-by: Hao Lan Signed-off-by: Jijie Shao Reviewed-by: Simon Horman Link: https://patch.msgid.link/20250722125423.1270673-4-shaojijie@huawei.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c index dada42e7e0ec9..27d10aeafb2b1 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c @@ -3094,11 +3094,7 @@ static void hclgevf_uninit_ae_dev(struct hnae3_ae_dev *ae_dev) static u32 hclgevf_get_max_channels(struct hclgevf_dev *hdev) { - struct hnae3_handle *nic = &hdev->nic; - struct hnae3_knic_private_info *kinfo = &nic->kinfo; - - return min_t(u32, hdev->rss_size_max, - hdev->num_tqps / kinfo->tc_info.num_tc); + return min(hdev->rss_size_max, hdev->num_tqps); } /** -- 2.39.5