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 <[EMAIL PROTECTED]>
diff -urN linux-2.6.15-rc1.upstream.orig/drivers/net/ixp2000/ixpdev.c
linux-2.6.15-rc1.upstream/drivers/net/ixp2000/ixpdev.c
--- linux-2.6.15-rc1.upstream.orig/drivers/net/ixp2000/ixpdev.c 2005-11-22
12:40:03.000000000 +0100
+++ linux-2.6.15-rc1.upstream/drivers/net/ixp2000/ixpdev.c 2005-11-22
12:42:54.000000000 +0100
@@ -147,12 +147,6 @@
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 @@
*/
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");
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
