From b89ca2b8200ad0963dd51bc09d7018a98d2de73c Mon Sep 17 00:00:00 2001
From: Linas Vepstas <linas@austin.ibm.com>
Date: Tue, 10 Oct 2006 16:13:05 -0500
Subject: [PATCH] --- yaml --- r: 39423 b: refs/heads/master c:
 68a8c609b3071c2441fa64f584d15311f2c10e61 h: refs/heads/master i:   39421:
 a0bdad71de58c42695c23a0e7fb24f3ae3114c04   39419:
 7f1dc4eb718b3ed5261cadb01c271cfc4e259554   39415:
 4daf19a04a114175fad6db9cfaede8136dcec9a3   39407:
 b4efa1c5d9acf327ab17a7c17b9aaf7bc7c70cad   39391:
 1e952bc1fb1cd18153d2f98e47b177733cd9fb0d   39359:
 342651289e9b657f159b5a5f054ef98f385e5284   39295:
 b87244245d3e6c04e030f36c6a3faf01e772c4d0   39167:
 d078a265b932eb6351688fd1ec9df69b239a2485   38911:
 270a202d1785a666dee95f7a2fc3552880a8621f v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/net/spider_net.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 22298a0b894d..c3fd5008226a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 204e5fa17c7ba45a89989f8da6dfe8e54d64b79b
+refs/heads/master: 68a8c609b3071c2441fa64f584d15311f2c10e61
diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c
index 96b5d00c21da..e429abc1e947 100644
--- a/trunk/drivers/net/spider_net.c
+++ b/trunk/drivers/net/spider_net.c
@@ -715,7 +715,7 @@ spider_net_release_tx_descr(struct spider_net_card *card)
 	len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
 	pci_unmap_single(card->pdev, descr->buf_addr, len,
 			PCI_DMA_TODEVICE);
-	dev_kfree_skb_any(skb);
+	dev_kfree_skb(skb);
 }
 
 static void
@@ -885,9 +885,10 @@ spider_net_xmit(struct sk_buff *skb, struct net_device *netdev)
  * spider_net_cleanup_tx_ring - cleans up the TX ring
  * @card: card structure
  *
- * spider_net_cleanup_tx_ring is called by the tx_timer (as we don't use
- * interrupts to cleanup our TX ring) and returns sent packets to the stack
- * by freeing them
+ * spider_net_cleanup_tx_ring is called by either the tx_timer
+ * or from the NAPI polling routine.
+ * This routine releases resources associted with transmitted
+ * packets, including updating the queue tail pointer.
  */
 static void
 spider_net_cleanup_tx_ring(struct spider_net_card *card)
@@ -1092,6 +1093,7 @@ spider_net_poll(struct net_device *netdev, int *budget)
 	int packets_to_do, packets_done = 0;
 	int no_more_packets = 0;
 
+	spider_net_cleanup_tx_ring(card);
 	packets_to_do = min(*budget, netdev->quota);
 
 	while (packets_to_do) {
@@ -1504,10 +1506,8 @@ spider_net_interrupt(int irq, void *ptr)
 		spider_net_rx_irq_off(card);
 		netif_rx_schedule(netdev);
 	}
-	if (status_reg & SPIDER_NET_TXINT ) {
-		spider_net_cleanup_tx_ring(card);
-		netif_wake_queue(netdev);
-	}
+	if (status_reg & SPIDER_NET_TXINT)
+		netif_rx_schedule(netdev);
 
 	if (status_reg & SPIDER_NET_ERRINT )
 		spider_net_handle_error_irq(card, status_reg);