[PATCH 2.6 8/14] e1000: Fix tx resource cleanup logic

[Ganesh Venkatesan <ganesh.venkatesan@xxxxxxxxx>]

Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@xxxxxxxxx>
diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c 
net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
--- net-drivers-2.6/drivers/net/e1000/e1000_main.c      2004-12-03 
07:24:37.090623184 -0800
+++ net-drivers-2.6/drivers/net/e1000.new/e1000_main.c  2004-12-03 
07:24:38.581396552 -0800
@@ -1059,6 +1059,24 @@ e1000_free_tx_resources(struct e1000_ada
        adapter->tx_ring.desc = NULL;
 }
 
+static inline void
+e1000_unmap_and_free_tx_resource(struct e1000_adapter *adapter,
+                       struct e1000_buffer *buffer_info)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       if(buffer_info->dma) {
+               pci_unmap_page(pdev,
+                              buffer_info->dma,
+                              buffer_info->length,
+                              PCI_DMA_TODEVICE);
+               buffer_info->dma = 0;
+       }
+       if(buffer_info->skb) {
+               dev_kfree_skb_any(buffer_info->skb);
+               buffer_info->skb = NULL;
+       }
+}
+
 /**
  * e1000_clean_tx_ring - Free Tx Buffers
  * @adapter: board private structure
@@ -1069,7 +1087,6 @@ e1000_clean_tx_ring(struct e1000_adapter
 {
        struct e1000_desc_ring *tx_ring = &adapter->tx_ring;
        struct e1000_buffer *buffer_info;
-       struct pci_dev *pdev = adapter->pdev;
        unsigned long size;
        unsigned int i;
 
@@ -1077,17 +1094,7 @@ e1000_clean_tx_ring(struct e1000_adapter
 
        for(i = 0; i < tx_ring->count; i++) {
                buffer_info = &tx_ring->buffer_info[i];
-               if(buffer_info->skb) {
-
-                       pci_unmap_page(pdev,
-                                      buffer_info->dma,
-                                      buffer_info->length,
-                                      PCI_DMA_TODEVICE);
-
-                       dev_kfree_skb(buffer_info->skb);
-
-                       buffer_info->skb = NULL;
-               }
+               e1000_unmap_and_free_tx_resource(adapter, buffer_info);
        }
 
        size = sizeof(struct e1000_buffer) * tx_ring->count;
@@ -2194,7 +2201,6 @@ e1000_clean_tx_irq(struct e1000_adapter 
 {
        struct e1000_desc_ring *tx_ring = &adapter->tx_ring;
        struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
        struct e1000_tx_desc *tx_desc, *eop_desc;
        struct e1000_buffer *buffer_info;
        unsigned int i, eop;
@@ -2209,19 +2215,7 @@ e1000_clean_tx_irq(struct e1000_adapter 
                        tx_desc = E1000_TX_DESC(*tx_ring, i);
                        buffer_info = &tx_ring->buffer_info[i];
 
-                       if(likely(buffer_info->dma)) {
-                               pci_unmap_page(pdev,
-                                              buffer_info->dma,
-                                              buffer_info->length,
-                                              PCI_DMA_TODEVICE);
-                               buffer_info->dma = 0;
-                       }
-
-                       if(buffer_info->skb) {
-                               dev_kfree_skb_any(buffer_info->skb);
-                               buffer_info->skb = NULL;
-                       }
-
+                       e1000_unmap_and_free_tx_resource(adapter, buffer_info);
                        tx_desc->buffer_addr = 0;
                        tx_desc->lower.data = 0;
                        tx_desc->upper.data = 0;