diff options
author | Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> | 2009-03-31 17:34:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-02 04:02:32 -0400 |
commit | a20a1199a8a7f2bc92bd2a01e212980328e42bc7 (patch) | |
tree | 9cfe7be1e2d5d0f90313b17d0252470bfadbfa7b | |
parent | 44df32c592f5a626c9f2ed56642e939788022408 (diff) |
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>
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 4 |
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: | |||
3486 | ixgbe_release_hw_control(adapter); | 3486 | ixgbe_release_hw_control(adapter); |
3487 | ixgbe_free_irq(adapter); | 3487 | ixgbe_free_irq(adapter); |
3488 | err_req_irq: | 3488 | err_req_irq: |
3489 | ixgbe_free_all_rx_resources(adapter); | ||
3490 | err_setup_rx: | 3489 | err_setup_rx: |
3491 | ixgbe_free_all_tx_resources(adapter); | 3490 | ixgbe_free_all_rx_resources(adapter); |
3492 | err_setup_tx: | 3491 | err_setup_tx: |
3492 | ixgbe_free_all_tx_resources(adapter); | ||
3493 | ixgbe_reset(adapter); | 3493 | ixgbe_reset(adapter); |
3494 | 3494 | ||
3495 | return err; | 3495 | return err; |