From 141682238146f6b39f317ee61b48c86994160a52 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Mon, 26 Jun 2006 00:03:40 -0700
Subject: [PATCH] --- yaml --- r: 30427 b: refs/heads/master c:
 8834807b43200b1658b49d3b779e74a4f77e4ffb h: refs/heads/master i:   30425:
 ce049b519fd0d84cca0085cfaa9d1de66d371ea1   30423:
 5fbcb52c133e23b62fe44c7e46964413d4f79782 v: v3

---
 [refs]                   |  2 +-
 trunk/net/core/netpoll.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e360443c3ac7..4c68a460a099 100644
--- 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
index 9cb781830380..377d1e7257b5 100644
--- 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 */