summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Leroy <colin@colino.net>2004-09-29 02:17:10 -0700
committerDavid S. Miller <davem@nuts.davemloft.net>2004-09-29 02:17:10 -0700
commit4562a42bb076e8088e2375f0f5d7153193765ec6 (patch)
tree954d1b2a069b35d749a0c30d28153c74ef301f13
parent8dce0aac26c6b9017d97978eaa75dc7a2bf61036 (diff)
[SUNGEM]: Add polling support.
Signed-off-by: Colin Leroy <colin@colino.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/sungem.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 8e3e553ebc36..949769e10750 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2742,6 +2742,23 @@ use_random:
}
#endif /* not Sparc and not PPC */
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void gem_netpoll(struct net_device *netdev)
+{
+ struct gem *gp = netdev->priv;
+ if (!gp->pdev)
+ return;
+ disable_irq(gp->pdev->irq);
+ gem_interrupt(gp->pdev->irq, netdev, NULL);
+ enable_irq(gp->pdev->irq);
+}
+#endif
+
static int __devinit gem_get_device_address(struct gem *gp)
{
#if defined(__sparc__) || defined(CONFIG_PPC_PMAC)
@@ -2940,6 +2957,9 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
dev->set_multicast_list = gem_set_multicast;
dev->do_ioctl = gem_ioctl;
dev->poll = gem_poll;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+ dev->poll_controller = gem_netpoll;
+#endif
dev->weight = 64;
dev->ethtool_ops = &gem_ethtool_ops;
dev->tx_timeout = gem_tx_timeout;