From ee5c0c9db3c31a5db962766ffb577aaf7b9e155c Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Wed, 23 Nov 2005 12:50:04 +0100
Subject: [PATCH] --- yaml --- r: 15775 b: refs/heads/master c:
 8ce51d69b755c39e714826899631629209896b70 h: refs/heads/master i:   15773:
 f9fa94c83c48797a66d5c6a615f592a762bd5f39   15771:
 c9f6784d41a2f8a640889e303b812ec288b352ed   15767:
 43f8c39e8852621c2475d8eea3389d3f14db35af   15759:
 9408245e831faffb5b4c06ace933da232424c6c7   15743:
 37b913db50c75040d77a3236cd2ec47d85c94ecf v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/net/ixp2000/ixpdev.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8156fb6269e6..92ca01a7b8e1 100644
--- 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
index 2ef8f8fa6c4a..0f7b8ab62d78 100644
--- 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;