---

yaml --- r: 300310 b: refs/heads/master c: ec13ee8 h: refs/heads/master v: v3
git-mirror · May 17, 2012 · 2132d5d · 2132d5d
1 parent 3fab463
commit 2132d5d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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();
 	}
 }