mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 13:11:40 +00:00
[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>
This commit is contained in:
parent
633949a145
commit
ab1976682f
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user