aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/vhost/net.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-10-13 09:44:24 -0400
committerIngo Molnar <mingo@elte.hu>2010-10-13 09:44:24 -0400
commit3d8a1a6a8af910cc2da566080d111e062a124ba6 (patch)
tree0c78b30a5c7aa083e215222989f982313c5141c0 /drivers/vhost/net.c
parent1b13fe6a6e9986dbc079cbb05090be75edbffa5d (diff)
parent5d0d71569e671239ae0d905ced9b65cd843f99ee (diff)
Merge branch 'amd-iommu/2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'drivers/vhost/net.c')
-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,
243 int r, nlogs = 0; 243 int r, nlogs = 0;
244 244
245 while (datalen > 0) { 245 while (datalen > 0) {
246 if (unlikely(headcount >= VHOST_NET_MAX_SG)) { 246 if (unlikely(seg >= VHOST_NET_MAX_SG)) {
247 r = -ENOBUFS; 247 r = -ENOBUFS;
248 goto err; 248 goto err;
249 } 249 }