Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68a8c609 authored by Linas Vepstas's avatar Linas Vepstas Committed by Jeff Garzik
Browse files

[PATCH] powerpc/cell spidernet NAPI polling info. 



This patch moves transmit queue cleanup code out of the
interrupt context, and into the NAPI polling routine.

Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: James K Lewis <jklewis@us.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 204e5fa1

drivers/net/spider_net.c

+8 −8
Original line number Diff line number Diff line
@@ -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);