From 3da5cbde39d702b775d158ddaa857a532d66d0d5 Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Fri, 20 May 2011 02:11:23 +0300
Subject: [PATCH] --- yaml --- r: 252952 b: refs/heads/master c:
 7a66f784375c5922315bbe879b789ee50b924d26 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/virtio_net.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7e4eafa5d9a1..6f92864196dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ab358c23cbf15cea08129cd722d1ce77433a94d
+refs/heads/master: 7a66f784375c5922315bbe879b789ee50b924d26
diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c
index 0cb0b0632672..f6853247a620 100644
--- a/trunk/drivers/net/virtio_net.c
+++ b/trunk/drivers/net/virtio_net.c
@@ -609,7 +609,7 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
 	 * before it gets out of hand.  Naturally, this wastes entries. */
 	if (capacity < 2+MAX_SKB_FRAGS) {
 		netif_stop_queue(dev);
-		if (unlikely(!virtqueue_enable_cb(vi->svq))) {
+		if (unlikely(!virtqueue_enable_cb_delayed(vi->svq))) {
 			/* More just got used, free them then recheck. */
 			capacity += free_old_xmit_skbs(vi);
 			if (capacity >= 2+MAX_SKB_FRAGS) {