]> err.no Git - linux-2.6/commitdiff
[PATCH] sis190: netconsole support.
authorFrancois Romieu <romieu@fr.zoreil.com>
Sat, 30 Jul 2005 11:09:20 +0000 (13:09 +0200)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 30 Jul 2005 22:20:59 +0000 (18:20 -0400)
netconsole support.

This stuff should be factored out of every driver.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
drivers/net/sis190.c

index fd303e7408acc73243566d5ec1bf1349d1d424f1..e374cf43fed01dca6afe4773b7841833328e155c 100644 (file)
@@ -629,6 +629,18 @@ out:
        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;