|
@@ -4068,6 +4068,9 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf)
|
|
|
DCB_CAP_DCBX_VER_IEEE;
|
|
|
pf->flags |= I40E_FLAG_DCB_ENABLED;
|
|
|
}
|
|
|
+ } else {
|
|
|
+ dev_info(&pf->pdev->dev, "AQ Querying DCB configuration failed: %d\n",
|
|
|
+ pf->hw.aq.asq_last_status);
|
|
|
}
|
|
|
|
|
|
out:
|
|
@@ -8300,7 +8303,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
if (err) {
|
|
|
dev_info(&pdev->dev, "init_pf_dcb failed: %d\n", err);
|
|
|
pf->flags &= ~I40E_FLAG_DCB_ENABLED;
|
|
|
- goto err_init_dcb;
|
|
|
+ /* Continue without DCB enabled */
|
|
|
}
|
|
|
#endif /* CONFIG_I40E_DCB */
|
|
|
|
|
@@ -8438,9 +8441,6 @@ err_vsis:
|
|
|
err_switch_setup:
|
|
|
i40e_reset_interrupt_capability(pf);
|
|
|
del_timer_sync(&pf->service_timer);
|
|
|
-#ifdef CONFIG_I40E_DCB
|
|
|
-err_init_dcb:
|
|
|
-#endif /* CONFIG_I40E_DCB */
|
|
|
err_mac_addr:
|
|
|
err_configure_lan_hmc:
|
|
|
(void)i40e_shutdown_lan_hmc(hw);
|