[3.13.y.z extended stable] Patch "igb: do a reset on SR-IOV re-init if device is down" has been added to staging queue

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

    igb: do a reset on SR-IOV re-init if device is down

to the linux-3.13.y-queue branch of the 3.13.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue

This patch is scheduled to be released in version 3.13.11.6.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.13.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From c245a4f4ed11e532434adb58cd128c1314e7783f Mon Sep 17 00:00:00 2001
From: Stefan Assmann <sassmann at kpanic.de>
Date: Thu, 10 Jul 2014 03:29:39 -0700
Subject: 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 at kpanic.de>
Tested-by: Aaron Brown <aaron.f.brown at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index ddbf995..6e0c7a9 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -7857,6 +7857,8 @@ int igb_reinit_queues(struct igb_adapter *adapter)

 	if (netif_running(netdev))
 		igb_close(netdev);
+	else
+		igb_reset(adapter);

 	igb_clear_interrupt_scheme(adapter);

--
1.9.1