summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorShannon Nelson <shannon.nelson@intel.com>2013-12-21 05:44:49 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-01-10 16:30:35 -0800
commit6ff4ef86be2043b24e89dd9b1e4b4e92fc7fc0fd (patch)
tree464cae3d4038ccf5c7fc69b3bc34c6e035e04ee3 /drivers/net/ethernet
parentc5c9eb9e78b2237ef81ef8cd83ba63206e266fc8 (diff)
downloadtalos-obmc-linux-6ff4ef86be2043b24e89dd9b1e4b4e92fc7fc0fd.tar.gz
talos-obmc-linux-6ff4ef86be2043b24e89dd9b1e4b4e92fc7fc0fd.zip
i40e: call clear_pxe after adminq is initialized
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>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index bc14a85561f8..182ed1893b1f 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -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;
OpenPOWER on IntegriCloud