Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0391bbe3 authored by Mark Rustad's avatar Mark Rustad Committed by David S. Miller
Browse files

ixgbe: Restore hw_addr in LER recovery paths 



The hw_addr needs to be restored in the pcie recovery path or
else the device will be perpetually removed. Also restore the
value in the resume path.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 28572760

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+4 −2
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2013 Intel Corporation.

  Copyright(c) 1999 - 2014 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -67,7 +67,7 @@ static char ixgbe_default_device_descr[] = 
#define DRV_VERSION "3.19.1-k"

const char ixgbe_driver_version[] = DRV_VERSION;

static const char ixgbe_copyright[] =

				"Copyright (c) 1999-2013 Intel Corporation.";

				"Copyright (c) 1999-2014 Intel Corporation.";



static const struct ixgbe_info *ixgbe_info_tbl[] = {

	[board_82598] = &ixgbe_82598_info,
@@ -5508,6 +5508,7 @@ static int ixgbe_resume(struct pci_dev *pdev) 
	struct net_device *netdev = adapter->netdev;

	u32 err;



	adapter->hw.hw_addr = adapter->io_addr;

	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);

	/*
@@ -8453,6 +8454,7 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) 
		e_err(probe, "Cannot re-enable PCI device after reset.\n");

		result = PCI_ERS_RESULT_DISCONNECT;

	} else {

		adapter->hw.hw_addr = adapter->io_addr;

		pci_set_master(pdev);

		pci_restore_state(pdev);

		pci_save_state(pdev);