From 2132d5df5890dc05366807997666459dc1f74ecb Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Wed, 16 May 2012 10:57:12 +0300
Subject: [PATCH] --- yaml --- r: 300310 b: refs/heads/master c:
 ec13ee80145ccb95b00e6e610044bbd94a170051 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 16451e0d4382..0978dfec594f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8ae0eb320b38415da94a41f75e9f99e0aaff06c
+refs/heads/master: ec13ee80145ccb95b00e6e610044bbd94a170051
diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c
index af8acc85f4bb..cbefe671bcc6 100644
--- a/trunk/drivers/net/virtio_net.c
+++ b/trunk/drivers/net/virtio_net.c
@@ -492,7 +492,9 @@ static void virtnet_napi_enable(struct virtnet_info *vi)
 	 * We synchronize against interrupts via NAPI_STATE_SCHED */
 	if (napi_schedule_prep(&vi->napi)) {
 		virtqueue_disable_cb(vi->rvq);
+		local_bh_disable();
 		__napi_schedule(&vi->napi);
+		local_bh_enable();
 	}
 }