joel16/android_kernel_sony_msm8994_rework
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994_rework.git synced 2025-01-15 05:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] via-rhine: NAPI poll enable

Browse Source 
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:
Stephen Hemminger 2006-08-14 23:00:18 -07:00 committed by Jeff Garzik
parent 633949a145
commit ab1976682f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/via-rhine.c
View File

@ -1048,6 +1048,8 @@ static void init_registers(struct net_device *dev)
rhine_set_rx_mode(dev); rhine_set_rx_mode(dev);
netif_poll_enable(dev);
/* Enable interrupts by setting the interrupt mask. */ /* Enable interrupts by setting the interrupt mask. */
iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow | iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow |
IntrRxDropped | IntrRxNoBuf | IntrTxAborted | IntrRxDropped | IntrRxNoBuf | IntrTxAborted |
@ -1199,7 +1201,6 @@ static void rhine_tx_timeout(struct net_device *dev)
dev->trans_start = jiffies; dev->trans_start = jiffies;
rp->stats.tx_errors++; rp->stats.tx_errors++;
netif_wake_queue(dev); netif_wake_queue(dev);
netif_poll_enable(dev);
} }
static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev) static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev)