Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab197668 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[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: default avatarStephen Hemminger <shemminger@osdl.org>
Cc: Roger Luethi <rl@hellgate.ch>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 633949a1

drivers/net/via-rhine.c

+2 −1
Original line number Diff line number Diff line
@@ -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)