summaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe
diff options
context:
space:
mode:
authorMallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>2009-03-31 21:34:44 +0000
committerDavid S. Miller <davem@davemloft.net>2009-04-02 01:02:32 -0700
commita20a1199a8a7f2bc92bd2a01e212980328e42bc7 (patch)
tree9cfe7be1e2d5d0f90313b17d0252470bfadbfa7b /drivers/net/ixgbe
parent44df32c592f5a626c9f2ed56642e939788022408 (diff)
downloadblackbird-op-linux-a20a1199a8a7f2bc92bd2a01e212980328e42bc7.tar.gz
blackbird-op-linux-a20a1199a8a7f2bc92bd2a01e212980328e42bc7.zip
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>
Diffstat (limited to 'drivers/net/ixgbe')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index f36cff52d48f..ae2af45eb8f1 100644
--- 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;
OpenPOWER on IntegriCloud