diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 17:50:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 17:50:58 -0400 |
commit | 5f129721713e099a04c6024015f97faa58562ab1 (patch) | |
tree | c5a498f217da044eb5ce870bedc95c4bf82cf185 /drivers/net/virtio_net.c | |
parent | 15a49b9a90c86c6cb7f270a699d2ae7468862c28 (diff) | |
parent | c893c8d763d8a8a757028a48ace7d1bb2dd8373f (diff) |
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull virtio updates from Rusty Russell:
"No real surprises"
* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
MAINTAINERS: add tools/virtio/ under virtio
tools/virtio: move module license stub to module.h
virtio: include asm/barrier explicitly
virtio: VIRTIO_F_ANY_LAYOUT feature
lguest: fix example launcher compilation for broken glibc headers.
virtio-net: fix the race between channels setting and refill
tools/lguest: real barriers.
tools/lguest: fix missing rmb().
virtio_balloon: leak_balloon(): only tell host if we got pages deflated
virtio-pci: fix leaks of msix_affinity_masks
Fix comment typo "CONFIG_PAE"
Diffstat (limited to 'drivers/net/virtio_net.c')
-rw-r--r-- | drivers/net/virtio_net.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 42d670a468f8..3d2a90a62649 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -902,7 +902,6 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) | |||
902 | struct scatterlist sg; | 902 | struct scatterlist sg; |
903 | struct virtio_net_ctrl_mq s; | 903 | struct virtio_net_ctrl_mq s; |
904 | struct net_device *dev = vi->dev; | 904 | struct net_device *dev = vi->dev; |
905 | int i; | ||
906 | 905 | ||
907 | if (!vi->has_cvq || !virtio_has_feature(vi->vdev, VIRTIO_NET_F_MQ)) | 906 | if (!vi->has_cvq || !virtio_has_feature(vi->vdev, VIRTIO_NET_F_MQ)) |
908 | return 0; | 907 | return 0; |
@@ -916,10 +915,8 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) | |||
916 | queue_pairs); | 915 | queue_pairs); |
917 | return -EINVAL; | 916 | return -EINVAL; |
918 | } else { | 917 | } else { |
919 | for (i = vi->curr_queue_pairs; i < queue_pairs; i++) | ||
920 | if (!try_fill_recv(&vi->rq[i], GFP_KERNEL)) | ||
921 | schedule_delayed_work(&vi->refill, 0); | ||
922 | vi->curr_queue_pairs = queue_pairs; | 918 | vi->curr_queue_pairs = queue_pairs; |
919 | schedule_delayed_work(&vi->refill, 0); | ||
923 | } | 920 | } |
924 | 921 | ||
925 | return 0; | 922 | return 0; |