The patch titled
Spidernet: remove rxramfull tasklet
has been removed from the -mm tree. Its filename was
spidernet-remove-rxramfull-tasklet.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Spidernet: remove rxramfull tasklet
From: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Get rid of the rxramfull tasklet, and let the NAPI poll routine deal with this
situation. (The rxramfull interrupt is simply stating that the h/w has run
out of room for incoming packets).
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 | 24 +-----------------------
drivers/net/spider_net.h | 1 -
2 files changed, 1 insertion(+), 24 deletions(-)
diff -puN drivers/net/spider_net.c~spidernet-remove-rxramfull-tasklet drivers/net/spider_net.c
--- a/drivers/net/spider_net.c~spidernet-remove-rxramfull-tasklet
+++ a/drivers/net/spider_net.c
@@ -1219,24 +1219,6 @@ spider_net_set_mac(struct net_device *ne
}
/**
- * spider_net_handle_rxram_full - cleans up RX ring upon RX RAM full interrupt
- * @card: card structure
- *
- * spider_net_handle_rxram_full empties the RX ring so that spider can put
- * more packets in it and empty its RX RAM. This is called in bottom half
- * context
- */
-static void
-spider_net_handle_rxram_full(struct spider_net_card *card)
-{
- while (spider_net_decode_one_descr(card, 0))
- ;
- spider_net_enable_rxchtails(card);
- spider_net_enable_rxdmac(card);
- netif_rx_schedule(card->netdev);
-}
-
-/**
* spider_net_handle_error_irq - handles errors raised by an interrupt
* @card: card structure
* @status_reg: interrupt status register 0 (GHIINT0STS)
@@ -1361,7 +1343,7 @@ spider_net_handle_error_irq(struct spide
pr_err("Spider RX RAM full, incoming packets "
"might be discarded!\n");
spider_net_rx_irq_off(card);
- tasklet_schedule(&card->rxram_full_tl);
+ netif_rx_schedule(card->netdev);
show_error = 0;
break;
@@ -1893,7 +1875,6 @@ spider_net_stop(struct net_device *netde
{
struct spider_net_card *card = netdev_priv(netdev);
- tasklet_kill(&card->rxram_full_tl);
netif_poll_disable(netdev);
netif_carrier_off(netdev);
netif_stop_queue(netdev);
@@ -2036,9 +2017,6 @@ spider_net_setup_netdev(struct spider_ne
pci_set_drvdata(card->pdev, netdev);
- card->rxram_full_tl.data = (unsigned long) card;
- card->rxram_full_tl.func =
- (void (*)(unsigned long)) spider_net_handle_rxram_full;
init_timer(&card->tx_timer);
card->tx_timer.function =
(void (*)(unsigned long)) spider_net_cleanup_tx_ring;
diff -puN drivers/net/spider_net.h~spidernet-remove-rxramfull-tasklet drivers/net/spider_net.h
--- a/drivers/net/spider_net.h~spidernet-remove-rxramfull-tasklet
+++ a/drivers/net/spider_net.h
@@ -442,7 +442,6 @@ struct spider_net_card {
struct spider_net_descr_chain rx_chain;
struct spider_net_descr *low_watermark;
- struct tasklet_struct rxram_full_tl;
struct timer_list tx_timer;
struct work_struct tx_timeout_task;
atomic_t tx_timeout_task_counter;
_
Patches currently in -mm which might be from linas@xxxxxxxxxxxxxx are
git-netdev-all.patch
spidernet-rework-rx-linked-list.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
