summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStefan Assmann <sassmann@kpanic.de>2014-07-10 03:29:39 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-28 08:00:03 -0700
commit125a0039d6eaee7b9e65be765f704d9278e7ccff (patch)
treebe6f5ab8e6f17d32773163f7de13f6f5867818ca /drivers
parent0979b7169679cc91edcadd98ffbe389400bbc088 (diff)
downloadlinux-3.10-125a0039d6eaee7b9e65be765f704d9278e7ccff.tar.gz
linux-3.10-125a0039d6eaee7b9e65be765f704d9278e7ccff.tar.bz2
linux-3.10-125a0039d6eaee7b9e65be765f704d9278e7ccff.zip
igb: do a reset on SR-IOV re-init if device is down
commit 76252723e88681628a3dbb9c09c963e095476f73 upstream. To properly re-initialize SR-IOV it is necessary to reset the device even if it is already down. Not doing this may result in Tx unit hangs. Signed-off-by: Stefan Assmann <sassmann@kpanic.de> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 64cbe0dfe04..4d3c8122e2a 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -7229,6 +7229,8 @@ static int igb_sriov_reinit(struct pci_dev *dev)
if (netif_running(netdev))
igb_close(netdev);
+ else
+ igb_reset(adapter);
igb_clear_interrupt_scheme(adapter);