ixgbe: Patch to fix driver panic while freeing up tx & rx resources

When network interface is made active we were not handling the error
scenarios properly to clean up rx & tx resources which might result in
a driver panic.

Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index f36cff52d48f28cf5b073badd35ffd1ebb1ccdfe..ae2af45eb8f1a3dcff6ccd93ba58b2f6d8ceebbe 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3486,10 +3486,10 @@ err_up:
        ixgbe_release_hw_control(adapter);
        ixgbe_free_irq(adapter);
 err_req_irq:
-       ixgbe_free_all_rx_resources(adapter);
 err_setup_rx:
-       ixgbe_free_all_tx_resources(adapter);
+       ixgbe_free_all_rx_resources(adapter);
 err_setup_tx:
+       ixgbe_free_all_tx_resources(adapter);
        ixgbe_reset(adapter);
 
        return err;