The patch titled
powerpc/cell spidernet ethtool -i version number
has been removed from the -mm tree. Its filename is
powerpc-cell-spidernet-ethtool-i-version-number.patch
This patch was dropped because it is obsolete
------------------------------------------------------
Subject: powerpc/cell spidernet ethtool -i version number
From: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Jim, as the official maintainer, you should explicitly ack this patch.
--linas
This patch moves transmit queue cleanup code out of the interrupt context, and
into the NAPI polling routine.
Signed-off-by: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Cc: James K Lewis <jklewis@xxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/spider_net.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff -puN drivers/net/spider_net.c~powerpc-cell-spidernet-ethtool-i-version-number drivers/net/spider_net.c
--- a/drivers/net/spider_net.c~powerpc-cell-spidernet-ethtool-i-version-number
+++ a/drivers/net/spider_net.c
@@ -887,9 +887,10 @@ out:
* 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)
@@ -1093,6 +1094,7 @@ spider_net_poll(struct net_device *netde
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) {
@@ -1505,10 +1507,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);
_
Patches currently in -mm which might be from linas@xxxxxxxxxxxxxx are
origin.patch
powerpc-cell-spidernet-ethtool-i-version-number.patch
powerpc-cell-spidernet-refine-locking.patch
git-powerpc.patch
pci-error-recovery-symbios-scsi-device-driver.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
