---

yaml --- r: 15775 b: refs/heads/master c: 8ce51d6 h: refs/heads/master i: 15773: f9fa94c 15771: c9f6784 15767: 43f8c39 15759: 9408245 15743: 37b913d v: v3
git-mirror · Dec 1, 2005 · ee5c0c9 · ee5c0c9
1 parent bc67334
commit ee5c0c9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cffbfcaf00c4a36592fabd54ae9f960b552322b6
+refs/heads/master: 8ce51d69b755c39e714826899631629209896b70
diff --git a/trunk/drivers/net/ixp2000/ixpdev.c b/trunk/drivers/net/ixp2000/ixpdev.c
@@ -218,6 +218,15 @@ static irqreturn_t ixpdev_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 	return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void ixpdev_poll_controller(struct net_device *dev)
+{
+	disable_irq(IRQ_IXP2000_THDA0);
+	ixpdev_interrupt(IRQ_IXP2000_THDA0, dev, NULL);
+	enable_irq(IRQ_IXP2000_THDA0);
+}
+#endif
+
 static int ixpdev_open(struct net_device *dev)
 {
 	struct ixpdev_priv *ip = netdev_priv(dev);
@@ -268,6 +277,9 @@ struct net_device *ixpdev_alloc(int channel, int sizeof_priv)
 	dev->poll = ixpdev_poll;
 	dev->open = ixpdev_open;
 	dev->stop = ixpdev_close;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	dev->poll_controller = ixpdev_poll_controller;
+#endif
 
 	dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
 	dev->weight = 64;