i40e: call clear_pxe after adminq is initialized
authorShannon Nelson <shannon.nelson@intel.com>
Sat, 21 Dec 2013 05:44:49 +0000 (05:44 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sat, 11 Jan 2014 00:30:35 +0000 (16:30 -0800)
In the latest firmware the clear_pxe_mode function will use the
AdminQ request, so call this after AdminQ is set up rather than
relying on i40e_pf_reset() to clear the PXE mode.

Change-ID: Ice8cba2e9cbc3c7bde0a0bcf8eaf5009abef040b
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_main.c

index bc14a85561f8b2e2392ee867d3e4f83f8e56cbc0..182ed1893b1f1f9a7e2b5d74018e87b75131efb5 100644 (file)
@@ -7612,6 +7612,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto err_pf_reset;
        }
 
+       i40e_clear_pxe_mode(hw);
        err = i40e_get_capabilities(pf);
        if (err)
                goto err_adminq_setup;