diff options
| author | Linus Walleij <[email protected]> | 2015-01-20 10:03:07 +0000 |
|---|---|---|
| committer | Linus Walleij <[email protected]> | 2015-01-20 10:03:07 +0000 |
| commit | ee65ef609aa81539ac3792df88f04bfe29a77546 (patch) | |
| tree | 6816eaa3d45fa1078408f2ccfa5f88d32733d1d9 /drivers/vhost/net.c | |
| parent | Documentation: gpio: Add APM X-Gene standby GPIO controller DTS binding (diff) | |
| parent | Linux 3.19-rc5 (diff) | |
| download | kernel-ee65ef609aa81539ac3792df88f04bfe29a77546.tar.gz kernel-ee65ef609aa81539ac3792df88f04bfe29a77546.zip | |
Merge tag 'v3.19-rc5' into devel
Linux 3.19-rc5
Diffstat (limited to 'drivers/vhost/net.c')
| -rw-r--r-- | drivers/vhost/net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 14419a8ccbb6..d415d69dc237 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -538,7 +538,7 @@ static int get_rx_bufs(struct vhost_virtqueue *vq, ++headcount; seg += in; } - heads[headcount - 1].len = cpu_to_vhost32(vq, len - datalen); + heads[headcount - 1].len = cpu_to_vhost32(vq, len + datalen); *iovcount = seg; if (unlikely(log)) *log_num = nlogs; |