redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] ixp2000: use netif_rx_schedule_test

Browse source 
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>
This commit is contained in:
Lennert Buytenhek 2005-11-23 12:49:25 +01:00 committed by Jeff Garzik
parent 6744a5069b
commit ee61249468
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/ixp2000/ixpdev.c
View file

@ -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");