From: Peng Li Date: Wed, 30 Jan 2019 20:55:50 +0000 (+0800) Subject: net: hns3: fix an issue for hclgevf_ae_get_hdev X-Git-Tag: Ubuntu-5.2.0-15.16~2488^2~392^2~2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=eed9535f9f716a532ec0c5d6cc7a48584acdf435;p=mirror_ubuntu-eoan-kernel.git net: hns3: fix an issue for hclgevf_ae_get_hdev 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 --- diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c index 93f306f42cf4..95f926971e3b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c @@ -86,7 +86,12 @@ static const u32 tqp_intr_reg_addr_list[] = {HCLGEVF_TQP_INTR_CTRL_REG, 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)