---

yaml --- r: 33508 b: refs/heads/master c: ab19766 h: refs/heads/master v: v3
git-mirror · Aug 19, 2006 · e7d51f0 · e7d51f0
1 parent 02b13d4
commit e7d51f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 633949a145df19d6d338b0f227f033a0a1c5562a
+refs/heads/master: ab1976682f31661a898b92593bccfeae14d0a0ae
diff --git a/trunk/drivers/net/via-rhine.c b/trunk/drivers/net/via-rhine.c
@@ -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)