igb: update suspend resume

Updates the suspend and resume to better handle the possibility of MSIX
vector changes.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 29 insertions, 17 deletions

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 89416ebda9ef..00e2e8d30ba2 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -272,6 +272,17 @@ static int igb_alloc_queues(struct igb_adapter *adapter)
         return 0;
 }
 
+static void igb_free_queues(struct igb_adapter *adapter)
+{
+        int i;
+
+        for (i = 0; i < adapter->num_rx_queues; i++)
+                netif_napi_del(&adapter->rx_ring[i].napi);
+
+        kfree(adapter->tx_ring);
+        kfree(adapter->rx_ring);
+}
+
 #define IGB_N0_QUEUE -1
 static void igb_assign_vector(struct igb_adapter *adapter, int rx_queue,
                               int tx_queue, int msix_vector)
@@ -1322,8 +1333,7 @@ err_eeprom:
                 iounmap(hw->flash_address);
 
         igb_remove_device(hw);
-        kfree(adapter->tx_ring);
-        kfree(adapter->rx_ring);
+        igb_free_queues(adapter);
 err_sw_init:
 err_hw_init:
         iounmap(hw->hw_addr);
@@ -1381,8 +1391,7 @@ static void __devexit igb_remove(struct pci_dev *pdev)
         igb_remove_device(&adapter->hw);
         igb_reset_interrupt_capability(adapter);
 
-        kfree(adapter->tx_ring);
-        kfree(adapter->rx_ring);
+        igb_free_queues(adapter);
 
         iounmap(adapter->hw.hw_addr);
         if (adapter->hw.flash_address)
@@ -4324,11 +4333,12 @@ static int igb_suspend(struct pci_dev *pdev, pm_message_t state)
 
         netif_device_detach(netdev);
 
-        if (netif_running(netdev)) {
-                WARN_ON(test_bit(__IGB_RESETTING, &adapter->state));
-                igb_down(adapter);
-                igb_free_irq(adapter);
-        }
+        if (netif_running(netdev))
+                igb_close(netdev);
+
+        igb_reset_interrupt_capability(adapter);
+
+        igb_free_queues(adapter);
 
 #ifdef CONFIG_PM
         retval = pci_save_state(pdev);
@@ -4415,10 +4425,11 @@ static int igb_resume(struct pci_dev *pdev)
         pci_enable_wake(pdev, PCI_D3hot, 0);
         pci_enable_wake(pdev, PCI_D3cold, 0);
 
-        if (netif_running(netdev)) {
-                err = igb_request_irq(adapter);
-                if (err)
-                        return err;
+        igb_set_interrupt_capability(adapter);
+
+        if (igb_alloc_queues(adapter)) {
+                dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
+                return -ENOMEM;
         }
 
         /* e1000_power_up_phy(adapter); */
@@ -4426,10 +4437,11 @@ static int igb_resume(struct pci_dev *pdev)
         igb_reset(adapter);
         wr32(E1000_WUS, ~0);
 
-        igb_init_manageability(adapter);
-
-        if (netif_running(netdev))
-                igb_up(adapter);
+        if (netif_running(netdev)) {
+                err = igb_open(netdev);
+                if (err)
+                        return err;
+        }
 
         netif_device_attach(netdev);