From 8395ea57b3e46daa0332826c0fd0f9924cc87e6d Mon Sep 17 00:00:00 2001
From: Jason Wang <jasowang@redhat.com>
Date: Wed, 5 Jun 2013 15:40:46 +0800
Subject: [PATCH] --- yaml --- r: 377007 b: refs/heads/master c:
 4364d5f96eed7994a2c625bd9216656e55fba0cb h: refs/heads/master i:   377005:
 239b1f9e3bbf847c8785c67c2dc296206a8611b4   377003:
 a0478dcafb1cdef899fba2679def53713c919b9f   376999:
 586477df4ed15aa857dc409f2c1729a325e28d73   376991:
 20e21cc7a8f0f7b34cece619e705e726960bcc24 v: v3

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

diff --git a/[refs] b/[refs]
index 085df4b3d55f..fe1f5fc9ac74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d88210910a34b3b5da71e13fc53859516104e232
+refs/heads/master: 4364d5f96eed7994a2c625bd9216656e55fba0cb
diff --git a/trunk/drivers/vhost/net.c b/trunk/drivers/vhost/net.c
index 2b51e2336aa2..b07d96b8c0d1 100644
--- a/trunk/drivers/vhost/net.c
+++ b/trunk/drivers/vhost/net.c
@@ -436,7 +436,8 @@ static void handle_tx(struct vhost_net *net)
 				kref_get(&ubufs->kref);
 			}
 			nvq->upend_idx = (nvq->upend_idx + 1) % UIO_MAXIOV;
-		}
+		} else
+			msg.msg_control = NULL;
 		/* TODO: Check specific error and bomb out unless ENOBUFS? */
 		err = sock->ops->sendmsg(NULL, sock, &msg, len);
 		if (unlikely(err < 0)) {