---

yaml --- r: 15766 b: refs/heads/master c: ee61249 h: refs/heads/master v: v3
git-mirror · Dec 1, 2005 · 3a4b179 · 3a4b179
1 parent 918c403
commit 3a4b179
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6744a5069bdadd96324290d015103163a0f7a45b
+refs/heads/master: ee61249468ec9bb8d032896ae2e8ba8a8b8c3972
diff --git a/trunk/drivers/net/ixp2000/ixpdev.c b/trunk/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");