diff options
| author | Steffen Klassert <klassert@mathematik.tu-chemnitz.de> | 2005-05-12 19:34:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-12 19:34:31 -0400 |
| commit | 7502cd1058152791fec94f32b719fec45e7f5de2 (patch) | |
| tree | 7ccc018d8125fde70ed7fe5a880f50d16b3828eb /drivers/net/8139cp.c | |
| parent | e21ba28262037f5fe7ca8746502c7c03c3da817f (diff) | |
| download | linux-7502cd1058152791fec94f32b719fec45e7f5de2.tar.bz2 | |
[PATCH] 8139cp - add netpoll support
Patch adds netpoll support to the 8139cp driver.
The patch needs some tests because I have no NIC of this type for testing.
Applies against linux-2.6.9-rc2-mm3
Signed-off-by: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
Diffstat (limited to 'drivers/net/8139cp.c')
| -rw-r--r-- | drivers/net/8139cp.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 18946a56d9b5..050d7602bbe9 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c @@ -398,6 +398,9 @@ struct cp_private { static void __cp_set_rx_mode (struct net_device *dev); static void cp_tx (struct cp_private *cp); static void cp_clean_rings (struct cp_private *cp); +#ifdef CONFIG_NET_POLL_CONTROLLER +static void cp_poll_controller(struct net_device *dev); +#endif static struct pci_device_id cp_pci_tbl[] = { { PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139, @@ -692,6 +695,19 @@ cp_interrupt (int irq, void *dev_instance, struct pt_regs *regs) return IRQ_HANDLED; } +#ifdef CONFIG_NET_POLL_CONTROLLER +/* + * Polling receive - used by netconsole and other diagnostic tools + * to allow network i/o with interrupts disabled. + */ +static void cp_poll_controller(struct net_device *dev) +{ + disable_irq(dev->irq); + cp_interrupt(dev->irq, dev, NULL); + enable_irq(dev->irq); +} +#endif + static void cp_tx (struct cp_private *cp) { unsigned tx_head = cp->tx_head; @@ -1763,6 +1779,9 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) dev->get_stats = cp_get_stats; dev->do_ioctl = cp_ioctl; dev->poll = cp_rx_poll; +#ifdef CONFIG_NET_POLL_CONTROLLER + dev->poll_controller = cp_poll_controller; +#endif dev->weight = 16; /* arbitrary? from NAPI_HOWTO.txt. */ #ifdef BROKEN dev->change_mtu = cp_change_mtu; |