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

Commit ee612494 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Jeff Garzik
Browse files

[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: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 6744a506

drivers/net/ixp2000/ixpdev.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -147,12 +147,6 @@ static int ixpdev_poll(struct net_device *dev, int *budget) 
	return 0;

	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)

static void ixpdev_tx_complete(void)

{

{

	int channel;

	int channel;
@@ -206,7 +200,7 @@ static irqreturn_t ixpdev_interrupt(int irq, void *dev_id, struct pt_regs *regs) 
	 */

	 */

	if (status & 0x00ff) {

	if (status & 0x00ff) {

		ixp2000_reg_wrb(IXP2000_IRQ_THD_ENABLE_CLEAR_A_0, 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]);

			__netif_rx_schedule(nds[0]);

		} else {

		} else {

			printk(KERN_CRIT "ixp2000: irq while polling!!\n");

			printk(KERN_CRIT "ixp2000: irq while polling!!\n");