summaryrefslogtreecommitdiffstats
path: root/drivers/net/ixp2000
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2005-11-23 12:49:25 +0100
committerJeff Garzik <jgarzik@pobox.com>2005-12-01 02:25:26 -0500
commitee61249468ec9bb8d032896ae2e8ba8a8b8c3972 (patch)
treef75e8b32e807bc39633fa04d5f47f1c381343ce5 /drivers/net/ixp2000
parent6744a5069bdadd96324290d015103163a0f7a45b (diff)
[PATCH] ixp2000: use netif_rx_schedule_test
The sky2 driver introduced netif_rx_schedule_test(). This is exactly what we need, so remove our local version of this function (which was called netif_rx_schedule_prep_notup) and use the generic one instead. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/ixp2000')
-rw-r--r--drivers/net/ixp2000/ixpdev.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c
index d9fd57d7a4b..e9d978a1d6b 100644
--- a/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
@@ -147,12 +147,6 @@ static int ixpdev_poll(struct net_device *dev, int *budget)
return 0;
}
-/* @@@ Ugly hack. */
-static inline int netif_rx_schedule_prep_notup(struct net_device *dev)
-{
- return !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
-}
-
static void ixpdev_tx_complete(void)
{
int channel;
@@ -206,7 +200,7 @@ static irqreturn_t ixpdev_interrupt(int irq, void *dev_id, struct pt_regs *regs)
*/
if (status & 0x00ff) {
ixp2000_reg_wrb(IXP2000_IRQ_THD_ENABLE_CLEAR_A_0, 0x00ff);
- if (likely(netif_rx_schedule_prep_notup(nds[0]))) {
+ if (likely(netif_rx_schedule_test(nds[0]))) {
__netif_rx_schedule(nds[0]);
} else {
printk(KERN_CRIT "ixp2000: irq while polling!!\n");