diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-08-15 08:00:18 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 23:44:29 +0200 |
| commit | ab1976682f31661a898b92593bccfeae14d0a0ae (patch) | |
| tree | 3f24400e997275daa7ef117498037b54f8a4ce63 /drivers/net | |
| parent | [PATCH] via-rhine: NAPI support (diff) | |
| download | linux-ab1976682f31661a898b92593bccfeae14d0a0ae.tar.xz linux-ab1976682f31661a898b92593bccfeae14d0a0ae.zip | |
[PATCH] via-rhine: NAPI poll enable
The poll_enable should be in init_registers before enabling interrupts, not
in tx_timeout. Thanks for spotting it Roger.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Cc: Roger Luethi <rl@hellgate.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/via-rhine.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index fee824002d10..fda367b92a28 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c @@ -1048,6 +1048,8 @@ static void init_registers(struct net_device *dev) rhine_set_rx_mode(dev); + netif_poll_enable(dev); + /* Enable interrupts by setting the interrupt mask. */ iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow | IntrRxDropped | IntrRxNoBuf | IntrTxAborted | @@ -1199,7 +1201,6 @@ static void rhine_tx_timeout(struct net_device *dev) dev->trans_start = jiffies; rp->stats.tx_errors++; netif_wake_queue(dev); - netif_poll_enable(dev); } static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev) |