diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-01-19 18:32:05 +0100 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-01-19 18:32:05 +0100 |
| commit | 54156da8937c9f5f84b4215e239a61ecc7c29275 (patch) | |
| tree | 7fb1e07ebedc5fbd35a29f5d450dee538763efdb /drivers/net/virtio_net.c | |
| parent | drm: add kernel doc for exported gem dmabuf_ops (diff) | |
| parent | BackMerge tag 'v4.15-rc8' into drm-next (diff) | |
| download | linux-54156da8937c9f5f84b4215e239a61ecc7c29275.tar.xz linux-54156da8937c9f5f84b4215e239a61ecc7c29275.zip | |
Merge airlied/drm-next into drm-misc-next
It's been a while since we've backmerged drm-next. Dave just brought
back 4.15-rc8, so now's a good time to freshen things up around here.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 19a985ef9104..559b215c0169 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -756,7 +756,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, int num_skb_frags; buf = virtqueue_get_buf_ctx(rq->vq, &len, &ctx); - if (unlikely(!ctx)) { + if (unlikely(!buf)) { pr_debug("%s: rx error: %d buffers out of %d missing\n", dev->name, num_buf, virtio16_to_cpu(vi->vdev, |