diff options
| author |   Sven Schnelle <svens@gmx.de> | 2005-10-21 22:55:15 -0400 |
|---|---|---|
| committer |   Kyle McMartin <kyle@parisc-linux.org> | 2005-10-21 22:55:15 -0400 |
| commit | c2709020adb442f7d25f0805af08a3b6cfedd7be (patch) | |
| tree | abebd5eb62274e79c5084c94bef2c0495529acce /drivers/net/lasi_82596.c | |
| parent | [PARISC] Remove the spurious do_softirq calls from entry.S (diff) | |
| download | linux-dev-c2709020adb442f7d25f0805af08a3b6cfedd7be.tar.xz linux-dev-c2709020adb442f7d25f0805af08a3b6cfedd7be.zip | |
[PARISC] Add NETPOLL support to lasi_82596
add netpoll support
Patch by Sven Schnelle <svens@gmx.de>
Signed-off-by: Sven Schnelle <svens@gmx.de>
Signed-off-by: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers/net/lasi_82596.c')
| -rw-r--r-- | drivers/net/lasi_82596.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c index a63d8a317d9e..f7b7238d8352 100644 --- a/drivers/net/lasi_82596.c +++ b/drivers/net/lasi_82596.c @@ -415,6 +415,10 @@ static int rx_ring_size = RX_RING_SIZE; static int ticks_limit = 100; static int max_cmd_backlog = TX_RING_SIZE-1; +#ifdef CONFIG_NET_POLL_CONTROLLER +static void i596_poll_controller(struct net_device *dev); +#endif + static inline void CA(struct net_device *dev) { @@ -636,11 +640,11 @@ static int init_i596_mem(struct net_device *dev) disable_irq(dev->irq); /* disable IRQs from LAN */ DEB(DEB_INIT, - printk("RESET 82596 port: %p (with IRQ %d disabled)\n", - (void*)(dev->base_addr + PA_I82596_RESET), + printk("RESET 82596 port: %lx (with IRQ %d disabled)\n", + (dev->base_addr + PA_I82596_RESET), dev->irq)); - gsc_writel(0, (void*)(dev->base_addr + PA_I82596_RESET)); /* Hard Reset */ + gsc_writel(0, (dev->base_addr + PA_I82596_RESET)); /* Hard Reset */ udelay(100); /* Wait 100us - seems to help */ /* change the scp address */ @@ -1209,6 +1213,9 @@ static int __devinit i82596_probe(struct net_device *dev, dev->set_multicast_list = set_multicast_list; dev->tx_timeout = i596_tx_timeout; dev->watchdog_timeo = TX_TIMEOUT; +#ifdef CONFIG_NET_POLL_CONTROLLER + dev->poll_controller = i596_poll_controller; +#endif dev->priv = (void *)(dev->mem_start); @@ -1242,6 +1249,14 @@ static int __devinit i82596_probe(struct net_device *dev, return 0; } +#ifdef CONFIG_NET_POLL_CONTROLLER +static void i596_poll_controller(struct net_device *dev) +{ + disable_irq(dev->irq); + i596_interrupt(dev->irq, dev, NULL); + enable_irq(dev->irq); +} +#endif static irqreturn_t i596_interrupt(int irq, void *dev_id, struct pt_regs *regs) { |