diff options
Diffstat (limited to 'drivers/net/virtio_net.c')
-rw-r--r-- | drivers/net/virtio_net.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 74636c5c41f0..c708ecc3cb2e 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -428,8 +428,8 @@ again: | |||
428 | /* Out of packets? */ | 428 | /* Out of packets? */ |
429 | if (received < budget) { | 429 | if (received < budget) { |
430 | napi_complete(napi); | 430 | napi_complete(napi); |
431 | if (unlikely(!vi->rvq->vq_ops->enable_cb(vi->rvq)) | 431 | if (unlikely(!vi->rvq->vq_ops->enable_cb(vi->rvq)) && |
432 | && napi_schedule_prep(napi)) { | 432 | napi_schedule_prep(napi)) { |
433 | vi->rvq->vq_ops->disable_cb(vi->rvq); | 433 | vi->rvq->vq_ops->disable_cb(vi->rvq); |
434 | __napi_schedule(napi); | 434 | __napi_schedule(napi); |
435 | goto again; | 435 | goto again; |
@@ -890,9 +890,9 @@ static int virtnet_probe(struct virtio_device *vdev) | |||
890 | INIT_DELAYED_WORK(&vi->refill, refill_work); | 890 | INIT_DELAYED_WORK(&vi->refill, refill_work); |
891 | 891 | ||
892 | /* If we can receive ANY GSO packets, we must allocate large ones. */ | 892 | /* If we can receive ANY GSO packets, we must allocate large ones. */ |
893 | if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) | 893 | if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) || |
894 | || virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO6) | 894 | virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO6) || |
895 | || virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_ECN)) | 895 | virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_ECN)) |
896 | vi->big_packets = true; | 896 | vi->big_packets = true; |
897 | 897 | ||
898 | if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) | 898 | if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) |