X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fcore%2Fnetpoll.c;h=6c7af390be0a515cfb1d09d2db79f16776e0dbe4;hb=f8e79ddd31c3615ddca26b9a469c44a7adbd4e13;hp=c12720895ecf90c049723f3cf9d854e78586ebeb;hpb=6d52dcbe56ca8464bcad56d98a64bcd781596663;p=linux-2.6

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index c12720895e..6c7af390be 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -70,6 +70,7 @@ static void queue_process(struct work_struct *work)
 		local_irq_save(flags);
 		__netif_tx_lock(txq, smp_processor_id());
 		if (netif_tx_queue_stopped(txq) ||
+		    netif_tx_queue_frozen(txq) ||
 		    dev->hard_start_xmit(skb, dev) != NETDEV_TX_OK) {
 			skb_queue_head(&npinfo->txq, skb);
 			__netif_tx_unlock(txq);