---

yaml --- r: 6585 b: refs/heads/master c: 4405d3b h: refs/heads/master i: 6583: 78dae83 v: v3
git-mirror · Jul 30, 2005 · 36ed102 · 36ed102
1 parent 67ecf4c
commit 36ed102
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 890e8d0a3ded0b1dee9020bbef7e9908e2228ffb
+refs/heads/master: 4405d3b5ef0a870e8d70ee4a3d050c89fcc40a86
diff --git a/trunk/drivers/net/sis190.c b/trunk/drivers/net/sis190.c
@@ -629,6 +629,18 @@ static irqreturn_t sis190_interrupt(int irq, void *__dev, struct pt_regs *regs)
 	return IRQ_RETVAL(handled);
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void sis190_netpoll(struct net_device *dev)
+{
+	struct sis190_private *tp = netdev_priv(dev);
+	struct pci_dev *pdev = tp->pci_dev;
+
+	disable_irq(pdev->irq);
+	sis190_interrupt(pdev->irq, dev, NULL);
+	enable_irq(pdev->irq);
+}
+#endif
+
 static void sis190_free_rx_skb(struct sis190_private *tp,
 			       struct sk_buff **sk_buff, struct RxDesc *desc)
 {
@@ -1300,6 +1312,9 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
 	dev->tx_timeout = sis190_tx_timeout;
 	dev->watchdog_timeo = SIS190_TX_TIMEOUT;
 	dev->hard_start_xmit = sis190_start_xmit;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	dev->poll_controller = sis190_netpoll;
+#endif
 	dev->set_multicast_list = sis190_set_rx_mode;
 	SET_ETHTOOL_OPS(dev, &sis190_ethtool_ops);
 	dev->irq = pdev->irq;