diff options
| author | Jeremy Fitzhardinge | 2006-06-26 09:03:40 +0200 |
|---|---|---|
| committer | David S. Miller | 2006-06-26 09:03:40 +0200 |
| commit | 8834807b43200b1658b49d3b779e74a4f77e4ffb (patch) | |
| tree | e9f8f2312b9ee3d4f6ea388f3b33c65e1495868c /net | |
| parent | [IRDA]: add some IBM think pads (diff) | |
| download | kernel-qcow2-linux-8834807b43200b1658b49d3b779e74a4f77e4ffb.tar.gz kernel-qcow2-linux-8834807b43200b1658b49d3b779e74a4f77e4ffb.tar.xz kernel-qcow2-linux-8834807b43200b1658b49d3b779e74a4f77e4ffb.zip | |
[NET] netpoll: don't spin forever sending to stopped queues
When transmitting a skb in netpoll_send_skb(), only retry a limited number
of times if the device queue is stopped.
Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
Acked-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/netpoll.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 9cb781830380..377d1e7257b5 100644 --- a/net/core/netpoll.c +++ b/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 */ |