[PATCH netdev-2.6 18/39] e1000: Fix desc. clean up

[Jeff Kirsher]

Fix desc. clean up

These were two separate community submitted patches.

Signed-off-by: Jeff Kirsher <[EMAIL PROTECTED]>
Signed-off-by: Jesse Brandeburg <[EMAIL PROTECTED]>
Signed-off-by: John Ronciak <[EMAIL PROTECTED]>
---

 drivers/net/e1000/e1000_ethtool.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/e1000/e1000_ethtool.c 
b/drivers/net/e1000/e1000_ethtool.c
index ceb9cd0..ad9ca2a 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -980,11 +980,11 @@ e1000_free_desc_rings(struct e1000_adapt
                }
        }
 
-       if(txdr->desc) {
+       if (txdr->desc) {
                pci_free_consistent(pdev, txdr->size, txdr->desc, txdr->dma);
                txdr->desc = NULL;
        }
-       if(rxdr->desc) {
+       if (rxdr->desc) {
                pci_free_consistent(pdev, rxdr->size, rxdr->desc, rxdr->dma);
                rxdr->desc = NULL;
        }
@@ -993,6 +993,7 @@ e1000_free_desc_rings(struct e1000_adapt
        txdr->buffer_info = NULL;
        kfree(rxdr->buffer_info);
        rxdr->buffer_info = NULL;
+
        return;
 }
 
Fix desc. clean up

These were two separate community submitted patches.

Signed-off-by: Jeff Kirsher <[EMAIL PROTECTED]>
Signed-off-by: Jesse Brandeburg <[EMAIL PROTECTED]>
Signed-off-by: John Ronciak <[EMAIL PROTECTED]>
---

 drivers/net/e1000/e1000_ethtool.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/e1000/e1000_ethtool.c 
b/drivers/net/e1000/e1000_ethtool.c
index ceb9cd0..ad9ca2a 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -980,11 +980,11 @@ e1000_free_desc_rings(struct e1000_adapt
                }
        }
 
-       if(txdr->desc) {
+       if (txdr->desc) {
                pci_free_consistent(pdev, txdr->size, txdr->desc, txdr->dma);
                txdr->desc = NULL;
        }
-       if(rxdr->desc) {
+       if (rxdr->desc) {
                pci_free_consistent(pdev, rxdr->size, rxdr->desc, rxdr->dma);
                rxdr->desc = NULL;
        }
@@ -993,6 +993,7 @@ e1000_free_desc_rings(struct e1000_adapt
        txdr->buffer_info = NULL;
        kfree(rxdr->buffer_info);
        rxdr->buffer_info = NULL;
+
        return;
 }