diff options
| author | Russell King <[email protected]> | 2010-10-04 21:23:26 +0000 |
|---|---|---|
| committer | Russell King <[email protected]> | 2010-10-04 21:23:30 +0000 |
| commit | a9fda02bfc91a281cd812ae15dabe6bfb9574f90 (patch) | |
| tree | d7be703f341870f15f87a59a63976f650078b4d6 /drivers/vhost/net.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/l... (diff) | |
| parent | ARM: add a vma entry for the user accessible vector page (diff) | |
| download | kernel-a9fda02bfc91a281cd812ae15dabe6bfb9574f90.tar.gz kernel-a9fda02bfc91a281cd812ae15dabe6bfb9574f90.zip | |
Merge branch 'for_rmk' of git://git.linaro.org/kernel/linux-linaro-next into devel-stable
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 29e850a7a2f9..7c8008225ee3 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -243,7 +243,7 @@ static int get_rx_bufs(struct vhost_virtqueue *vq, int r, nlogs = 0; while (datalen > 0) { - if (unlikely(headcount >= VHOST_NET_MAX_SG)) { + if (unlikely(seg >= VHOST_NET_MAX_SG)) { r = -ENOBUFS; goto err; } |