lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 246/321] net: hns3: fix an issue for hclgevf_ae_get_hdev
    Date
    From: Peng Li <lipeng321@huawei.com>

    [ 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 <lipeng321@huawei.com>
    Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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


    \
     
     \ /
      Last update: 2019-12-03 23:56    [W:2.241 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site