hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IB/hfi1: Fix hfi1_netdev_rx_init() error handling 

The hfi1_vnic_up() function doesn't check whether hfi1_netdev_rx_init()
returns errors.  In hfi1_vnic_init() we need to change the code to
preserve the error code instead of returning success.

Fixes: 2280740f01 ("IB/hfi1: Virtual Network Interface Controller (VNIC) HW support")
Fixes: 4730f4a6c6 ("IB/hfi1: Activate the dummy netdev")
Link: https://lore.kernel.org/r/20200530140224.GA1330098@mwanda
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Dan Carpenter 2020-05-30 17:02:24 +03:00 committed by Jason Gunthorpe
parent 4d12c04caa
commit 24c567ff75
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/infiniband/hw/hfi1/vnic_main.c
View File

@ -457,13 +457,19 @@ static int hfi1_vnic_up(struct hfi1_vnic_vport_info *vinfo)
if (rc < 0)
return rc;
hfi1_netdev_rx_init(dd);
rc = hfi1_netdev_rx_init(dd);
if (rc)
goto err_remove;
netif_carrier_on(netdev);
netif_tx_start_all_queues(netdev);
set_bit(HFI1_VNIC_UP, &vinfo->flags);
return 0;
err_remove:
hfi1_netdev_remove_data(dd, VNIC_ID(vinfo->vesw_id));
return rc;
}
static void hfi1_vnic_down(struct hfi1_vnic_vport_info *vinfo)
@ -512,7 +518,8 @@ static int hfi1_vnic_init(struct hfi1_vnic_vport_info *vinfo)
goto txreq_fail;
}
if (hfi1_netdev_rx_init(dd)) {
rc = hfi1_netdev_rx_init(dd);
if (rc) {
dd_dev_err(dd, "Unable to initialize netdev contexts\n");
goto alloc_fail;
}