---

yaml --- r: 377007 b: refs/heads/master c: 4364d5f h: refs/heads/master i: 377005: 239b1f9 377003: a0478dc 376999: 586477d 376991: 20e21cc v: v3
git-mirror · Jun 10, 2013 · 8395ea5 · 8395ea5
1 parent 839b416
commit 8395ea5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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)) {