i40e: don't give up on DCB error after reset

We don't need to give up in the reset/rebuild process if the DCB setup failed,
so handle it here the same as in the probe setup.  Also adjust the log strings
a little to look less scary.

Change-ID: I57308d703047e61d3f1a5e471ea77be232444ca0
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index cd34d9b..fd6411e 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -4533,7 +4533,8 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf)
                                "DCBX offload is supported for this PF.\n");
                }
        } else {
-               dev_info(&pf->pdev->dev, "AQ Querying DCB configuration failed: %d\n",
+               dev_info(&pf->pdev->dev,
+                        "AQ Querying DCB configuration failed: aq_err %d\n",
                         pf->hw.aq.asq_last_status);
        }
 
@@ -6188,8 +6189,9 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit)
 #ifdef CONFIG_I40E_DCB
        ret = i40e_init_pf_dcb(pf);
        if (ret) {
-               dev_info(&pf->pdev->dev, "init_pf_dcb failed: %d\n", ret);
-               goto end_core_reset;
+               dev_info(&pf->pdev->dev, "DCB init failed %d, disabled\n", ret);
+               pf->flags &= ~I40E_FLAG_DCB_CAPABLE;
+               /* Continue without DCB enabled */
        }
 #endif /* CONFIG_I40E_DCB */
 #ifdef I40E_FCOE
@@ -9269,7 +9271,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 #ifdef CONFIG_I40E_DCB
        err = i40e_init_pf_dcb(pf);
        if (err) {
-               dev_info(&pdev->dev, "init_pf_dcb failed: %d\n", err);
+               dev_info(&pdev->dev, "DCB init failed %d, disabled\n", err);
                pf->flags &= ~I40E_FLAG_DCB_CAPABLE;
                /* Continue without DCB enabled */
        }