From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N2qdG-0004XL-AT for qemu-devel@nongnu.org; Tue, 27 Oct 2009 14:18:58 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N2qdC-0004Vm-Qf for qemu-devel@nongnu.org; Tue, 27 Oct 2009 14:18:58 -0400 Received: from [199.232.76.173] (port=37359 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N2qdC-0004Vb-HY for qemu-devel@nongnu.org; Tue, 27 Oct 2009 14:18:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22131) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N2qdB-0000e9-2I for qemu-devel@nongnu.org; Tue, 27 Oct 2009 14:18:54 -0400 From: Mark McLoughlin Date: Tue, 27 Oct 2009 18:16:37 +0000 Message-Id: <1256667399-3149-4-git-send-email-markmc@redhat.com> In-Reply-To: <1256667399-3149-1-git-send-email-markmc@redhat.com> References: <1256667399-3149-1-git-send-email-markmc@redhat.com> Subject: [Qemu-devel] [PATCH 3/5] net/queue: queue packets even if sender doesn't supply a callback List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Sven Rudolph , Scott Tsai , Mark McLoughlin Now that we disable any receiver whose queue is full, we do not require senders to handle a zero return by supplying a sent callback. This is a second step towards allowing can_receive() handlers to return true even if no buffer space is available. Signed-off-by: Mark McLoughlin --- net/queue.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/queue.c b/net/queue.c index e91a9a5..2ea6cd0 100644 --- a/net/queue.c +++ b/net/queue.c @@ -186,7 +186,7 @@ ssize_t qemu_net_queue_send(NetQueue *queue, } ret = qemu_net_queue_deliver(queue, sender, flags, data, size); - if (ret == 0 && sent_cb != NULL) { + if (ret == 0) { qemu_net_queue_append(queue, sender, flags, data, size, sent_cb); return 0; } @@ -210,7 +210,7 @@ ssize_t qemu_net_queue_send_iov(NetQueue *queue, } ret = qemu_net_queue_deliver_iov(queue, sender, flags, iov, iovcnt); - if (ret == 0 && sent_cb != NULL) { + if (ret == 0) { qemu_net_queue_append_iov(queue, sender, flags, iov, iovcnt, sent_cb); return 0; } @@ -246,7 +246,7 @@ void qemu_net_queue_flush(NetQueue *queue) packet->flags, packet->data, packet->size); - if (ret == 0 && packet->sent_cb != NULL) { + if (ret == 0) { QTAILQ_INSERT_HEAD(&queue->packets, packet, entry); break; } -- 1.6.2.5