Skip to content

Commit

Permalink
[PATCH] via-rhine: NAPI poll enable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Hemminger authored and Jeff Garzik committed Aug 19, 2006
1 parent 633949a commit ab19766
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/net/via-rhine.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit ab19766

Please sign in to comment.