diff options
author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2008-09-11 22:59:16 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 18:54:57 -0400 |
commit | c431f97ef96026e6da7032a871a0789cf5a2eaea (patch) | |
tree | 40e3fcc159d95916bb8a4071fe10f46b01f54d46 /drivers/net/ixgbe/ixgbe_main.c | |
parent | b95f5fcb8ba6073a652927d232a7a7cb552afe62 (diff) |
ixgbe: fix ring reallocation in ethtool
changing ring sizes in ethtool needs to be robust. If an allocation fails the
driver must continue operation, with the previous settings.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 3b0481a9979e..cde5d5a5a9ab 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -2731,8 +2731,8 @@ alloc_failed: | |||
2731 | * | 2731 | * |
2732 | * Free all transmit software resources | 2732 | * Free all transmit software resources |
2733 | **/ | 2733 | **/ |
2734 | static void ixgbe_free_tx_resources(struct ixgbe_adapter *adapter, | 2734 | void ixgbe_free_tx_resources(struct ixgbe_adapter *adapter, |
2735 | struct ixgbe_ring *tx_ring) | 2735 | struct ixgbe_ring *tx_ring) |
2736 | { | 2736 | { |
2737 | struct pci_dev *pdev = adapter->pdev; | 2737 | struct pci_dev *pdev = adapter->pdev; |
2738 | 2738 | ||
@@ -2761,14 +2761,14 @@ static void ixgbe_free_all_tx_resources(struct ixgbe_adapter *adapter) | |||
2761 | } | 2761 | } |
2762 | 2762 | ||
2763 | /** | 2763 | /** |
2764 | * ixgbe_free_rx_resources - Free Rx Resources | 2764 | * ixgbe_ree_rx_resources - Free Rx Resources |
2765 | * @adapter: board private structure | 2765 | * @adapter: board private structure |
2766 | * @rx_ring: ring to clean the resources from | 2766 | * @rx_ring: ring to clean the resources from |
2767 | * | 2767 | * |
2768 | * Free all receive software resources | 2768 | * Free all receive software resources |
2769 | **/ | 2769 | **/ |
2770 | static void ixgbe_free_rx_resources(struct ixgbe_adapter *adapter, | 2770 | void ixgbe_free_rx_resources(struct ixgbe_adapter *adapter, |
2771 | struct ixgbe_ring *rx_ring) | 2771 | struct ixgbe_ring *rx_ring) |
2772 | { | 2772 | { |
2773 | struct pci_dev *pdev = adapter->pdev; | 2773 | struct pci_dev *pdev = adapter->pdev; |
2774 | 2774 | ||