Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h

1 files changed, 0 insertions, 8 deletions

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 937a49d6772c..72bf8bc09014 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -227,7 +227,6 @@ static bool vring_enable_cb(struct virtqueue *_vq)
         struct vring_virtqueue *vq = to_vvq(_vq);
 
         START_USE(vq);
-        BUG_ON(!(vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT));
 
         /* We optimistically turn back on interrupts, then check if there was
          * more to do. */
@@ -254,13 +253,6 @@ irqreturn_t vring_interrupt(int irq, void *_vq)
         if (unlikely(vq->broken))
                 return IRQ_HANDLED;
 
-        /* Other side may have missed us turning off the interrupt,
-         * but we should preserve disable semantic for virtio users. */
-        if (unlikely(vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT)) {
-                pr_debug("virtqueue interrupt after disable for %p\n", vq);
-                return IRQ_HANDLED;
-        }
-
         pr_debug("virtqueue callback for %p (%p)\n", vq, vq->vq.callback);
         if (vq->vq.callback)
                 vq->vq.callback(&vq->vq);