---

yaml --- r: 30427 b: refs/heads/master c: 8834807 h: refs/heads/master i: 30425: ce049b5 30423: 5fbcb52 v: v3
git-mirror · Jun 26, 2006 · 1416822 · 1416822
1 parent b6ec0ec
commit 1416822
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d83561a4d67863b4aa297e8f598823dd4dfe855e
+refs/heads/master: 8834807b43200b1658b49d3b779e74a4f77e4ffb
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
@@ -279,14 +279,10 @@ static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
 		 * network drivers do not expect to be called if the queue is
 		 * stopped.
 		 */
-		if (netif_queue_stopped(np->dev)) {
-			netif_tx_unlock(np->dev);
-			netpoll_poll(np);
-			udelay(50);
-			continue;
-		}
+		status = NETDEV_TX_BUSY;
+		if (!netif_queue_stopped(np->dev))
+			status = np->dev->hard_start_xmit(skb, np->dev);
 
-		status = np->dev->hard_start_xmit(skb, np->dev);
 		netif_tx_unlock(np->dev);
 
 		/* success */