From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCRYq-0004xn-UO for qemu-devel@nongnu.org; Fri, 14 Sep 2012 04:47:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TCRYl-0000vh-1w for qemu-devel@nongnu.org; Fri, 14 Sep 2012 04:47:40 -0400 Received: from mail-wg0-f53.google.com ([74.125.82.53]:48553) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCRYk-0000s8-Rx for qemu-devel@nongnu.org; Fri, 14 Sep 2012 04:47:34 -0400 Received: by mail-wg0-f53.google.com with SMTP id dr1so370149wgb.10 for ; Fri, 14 Sep 2012 01:47:34 -0700 (PDT) From: Stefan Hajnoczi Date: Fri, 14 Sep 2012 09:46:57 +0100 Message-Id: <1347612420-5704-11-git-send-email-stefanha@gmail.com> In-Reply-To: <1347612420-5704-1-git-send-email-stefanha@gmail.com> References: <1347612420-5704-1-git-send-email-stefanha@gmail.com> Subject: [Qemu-devel] [PATCH 10/13] net: broadcast hub packets if at least one port can receive List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org, Stefan Hajnoczi From: Stefan Hajnoczi In commit 60c07d933c66c4b30a83b7ccbc8a0cb3df1b2d0e ("net: fix qemu_can_send_packet logic") the "VLAN" broadcast behavior was changed to queue packets if any net client cannot receive. It turns out that this was not actually the right fix and just hides the real bug that hw/usb/dev-network.c:usbnet_receive() clobbers its receive buffer when called multiple times in a row. The commit also introduced a new bug that "VLAN" packets would not be sent if one of multiple net clients was down. The hw/usb/dev-network.c bug has since been fixed, so this patch reverts broadcast behavior to send packets as long as one net client can receive. Packets simply get queued for the net clients that are temporarily unable to receive. Reported-by: Roy.Li Signed-off-by: Stefan Hajnoczi --- net/hub.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/hub.c b/net/hub.c index ac157e3..650a8b4 100644 --- a/net/hub.c +++ b/net/hub.c @@ -97,12 +97,12 @@ static int net_hub_port_can_receive(NetClientState *nc) continue; } - if (!qemu_can_send_packet(&port->nc)) { - return 0; + if (qemu_can_send_packet(&port->nc)) { + return 1; } } - return 1; + return 0; } static ssize_t net_hub_port_receive(NetClientState *nc, -- 1.7.10.4