diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-21 03:53:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-21 03:53:04 +0200 |
| commit | 17eea0df5f7068fc04959e655ef8f0a0ed097e19 (patch) | |
| tree | d44b5cceb813dddfd1e62fe9f92556cf113d62fd /drivers/net/virtio_net.c | |
| parent | ipv6/exthdrs: strict Pad1 and PadN check (diff) | |
| parent | Linux 3.4 (diff) | |
| download | linux-17eea0df5f7068fc04959e655ef8f0a0ed097e19.tar.xz linux-17eea0df5f7068fc04959e655ef8f0a0ed097e19.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index fa58c7869954..9ce6995e8d08 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -501,7 +501,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(); } } |