summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-09-20 11:13:34 -0700
committerDavid S. Miller <davem@davemloft.net>2010-09-20 11:13:34 -0700
commit3779298b81cd9a2531cec93e3beefc1acdb01382 (patch)
tree7182f6b13a789c6353e59d26fdc0781f843ca9a8
parent8444cf712c5f71845cba9dc30d8f530ff0d5ff83 (diff)
parentee05d6939ed17b55e9c2466af32c208e0d547eb8 (diff)
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
-rw-r--r--drivers/vhost/net.c2
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;
}