Unverified Commit e8c2300b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14905 [OLK-5.10] backport important bugfix from the kernel-5.10.y 

Merge Pull Request from: @shangbaogen 
 
Broadcom nic driver：
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.10.y&id=a9615376a999b1909f521849b121bc2eab70dbc6 
 
Link:https://gitee.com/openeuler/kernel/pulls/14905

 

Reviewed-by: default avatarsanglipeng <sanglipeng1@jd.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents a348aa03 1263b4d6

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+6 −2
Original line number Diff line number Diff line
@@ -13107,8 +13107,12 @@ static void bnxt_io_resume(struct pci_dev *pdev) 
	rtnl_lock();



	err = bnxt_hwrm_func_qcaps(bp);

	if (!err && netif_running(netdev))

	if (!err) {

		if (netif_running(netdev))

			err = bnxt_open(netdev);

		else

			err = bnxt_reserve_rings(bp, true);

	}



	bnxt_ulp_start(bp, err);

	if (!err) {