diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-08-15 02:00:18 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:44:29 -0400 |
commit | ab1976682f31661a898b92593bccfeae14d0a0ae (patch) | |
tree | 3f24400e997275daa7ef117498037b54f8a4ce63 | |
parent | 633949a145df19d6d338b0f227f033a0a1c5562a (diff) |
[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>
-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) | |||
1048 | 1048 | ||
1049 | rhine_set_rx_mode(dev); | 1049 | rhine_set_rx_mode(dev); |
1050 | 1050 | ||
1051 | netif_poll_enable(dev); | ||
1052 | |||
1051 | /* Enable interrupts by setting the interrupt mask. */ | 1053 | /* Enable interrupts by setting the interrupt mask. */ |
1052 | iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow | | 1054 | iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow | |
1053 | IntrRxDropped | IntrRxNoBuf | IntrTxAborted | | 1055 | IntrRxDropped | IntrRxNoBuf | IntrTxAborted | |
@@ -1199,7 +1201,6 @@ static void rhine_tx_timeout(struct net_device *dev) | |||
1199 | dev->trans_start = jiffies; | 1201 | dev->trans_start = jiffies; |
1200 | rp->stats.tx_errors++; | 1202 | rp->stats.tx_errors++; |
1201 | netif_wake_queue(dev); | 1203 | netif_wake_queue(dev); |
1202 | netif_poll_enable(dev); | ||
1203 | } | 1204 | } |
1204 | 1205 | ||
1205 | static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev) | 1206 | static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev) |