From 0d1d6562d2d0a67a4b4ad7d3fd870ab927090477 Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Sun, 17 Mar 2013 02:46:09 +0000
Subject: [PATCH] --- yaml --- r: 361478 b: refs/heads/master c:
 46aa92d1ba162b4b3d6b7102440e459d4e4ee255 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/vhost/net.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 76b6232f2408..4b5f22d36bae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d84fa98aca7f05f7010022bc45acb1b50326332
+refs/heads/master: 46aa92d1ba162b4b3d6b7102440e459d4e4ee255
diff --git a/trunk/drivers/vhost/net.c b/trunk/drivers/vhost/net.c
index 959b1cd89e6a..ec6fb3fa59bb 100644
--- a/trunk/drivers/vhost/net.c
+++ b/trunk/drivers/vhost/net.c
@@ -339,7 +339,8 @@ static void handle_tx(struct vhost_net *net)
 				msg.msg_controllen = 0;
 				ubufs = NULL;
 			} else {
-				struct ubuf_info *ubuf = &vq->ubuf_info[head];
+				struct ubuf_info *ubuf;
+				ubuf = vq->ubuf_info + vq->upend_idx;
 
 				vq->heads[vq->upend_idx].len =
 					VHOST_DMA_IN_PROGRESS;