From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A4A9C432C0 for ; Tue, 3 Dec 2019 22:55:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EED6020656 for ; Tue, 3 Dec 2019 22:55:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413757; bh=lYKka7mtVHbQ/4kpHelX0YbKeThZTD6/2UrcxUWeCbM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lb76LYnbPzva3VU3rXJ9LZEjPAiMkrJ7Mr93uoKDlHg+zG2XFLhKvZeu6U0vOHkXB 0QLCMToX/eWzGWIuGqTr1123b9evCtBeSPIQAGGojJajU++sz/k0vfC5+UM41MzJa+ KPd3mEIqtnHOXCMTs3x/1QUpowmtIOa7O5mAV8mk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730386AbfLCWzz (ORCPT ); Tue, 3 Dec 2019 17:55:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:50382 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728369AbfLCWzt (ORCPT ); Tue, 3 Dec 2019 17:55:49 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E05372053B; Tue, 3 Dec 2019 22:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413749; bh=lYKka7mtVHbQ/4kpHelX0YbKeThZTD6/2UrcxUWeCbM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qhaKVk57BDBOIWEpANFJ26mRiqzST0R/8zHvxBvLRmN845ITkCwp/DlwRbd+gEW0M fJ7rE1NmIbE8v0/pFGPSm/TCxLWYf/xnYYULgDseIYxODkY540ktR00UZrVInovTvp oc8i8oBdvlzZVcRBgFicszxfzxgfJ3QNnqbNtG2o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peng Li , Huazhong Tan , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 246/321] net: hns3: fix an issue for hclgevf_ae_get_hdev Date: Tue, 3 Dec 2019 23:35:12 +0100 Message-Id: <20191203223439.937342013@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peng Li [ Upstream commit eed9535f9f716a532ec0c5d6cc7a48584acdf435 ] HNS3 VF driver support NIC and Roce, hdev stores NIC handle and Roce handle, should use correct parameter for container_of. Signed-off-by: Peng Li Signed-off-by: Huazhong Tan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c index beae1e2cd59b1..67db19709deaa 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c @@ -26,7 +26,12 @@ MODULE_DEVICE_TABLE(pci, ae_algovf_pci_tbl); static inline struct hclgevf_dev *hclgevf_ae_get_hdev( struct hnae3_handle *handle) { - return container_of(handle, struct hclgevf_dev, nic); + if (!handle->client) + return container_of(handle, struct hclgevf_dev, nic); + else if (handle->client->type == HNAE3_CLIENT_ROCE) + return container_of(handle, struct hclgevf_dev, roce); + else + return container_of(handle, struct hclgevf_dev, nic); } static int hclgevf_tqps_update_stats(struct hnae3_handle *handle) -- 2.20.1