From patchwork Wed Mar 7 13:05:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 145258 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7BA46B6EEA for ; Thu, 8 Mar 2012 00:06:11 +1100 (EST) Received: from localhost ([::1]:41999 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5GZE-0005rH-P3 for incoming@patchwork.ozlabs.org; Wed, 07 Mar 2012 08:06:08 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60800) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5GYr-0005Xh-Ik for qemu-devel@nongnu.org; Wed, 07 Mar 2012 08:05:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S5GYa-0008Fi-Pu for qemu-devel@nongnu.org; Wed, 07 Mar 2012 08:05:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64472) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5GYa-0008EY-Hn for qemu-devel@nongnu.org; Wed, 07 Mar 2012 08:05:28 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q27D5Rxr006883 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 7 Mar 2012 08:05:27 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-32.ams2.redhat.com [10.36.116.32]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q27D5PTt017149; Wed, 7 Mar 2012 08:05:26 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 180B641F21; Wed, 7 Mar 2012 14:05:21 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2012 14:05:12 +0100 Message-Id: <1331125520-13467-13-git-send-email-kraxel@redhat.com> In-Reply-To: <1331125520-13467-1-git-send-email-kraxel@redhat.com> References: <1331125520-13467-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Hans de Goede , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 12/20] usb: return BABBLE rather then NAK when we receive too much data X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Hans de Goede Signed-off-by: Hans de Goede Signed-off-by: Gerd Hoffmann --- usb-linux.c | 8 +++++++- usb-redir.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/usb-linux.c b/usb-linux.c index 47994f3..38df9e6 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -364,6 +364,10 @@ static void async_complete(void *opaque) p->result = USB_RET_STALL; break; + case -EOVERFLOW: + p->result = USB_RET_BABBLE; + break; + default: p->result = USB_RET_NAK; break; @@ -722,6 +726,8 @@ static int urb_status_to_usb_ret(int status) switch (status) { case -EPIPE: return USB_RET_STALL; + case -EOVERFLOW: + return USB_RET_BABBLE; default: return USB_RET_NAK; } @@ -759,7 +765,7 @@ static int usb_host_handle_iso_data(USBHostDevice *s, USBPacket *p, int in) } else if (aurb[i].urb.iso_frame_desc[j].actual_length > p->iov.size) { printf("husb: received iso data is larger then packet\n"); - len = USB_RET_NAK; + len = USB_RET_BABBLE; /* All good copy data over */ } else { len = aurb[i].urb.iso_frame_desc[j].actual_length; diff --git a/usb-redir.c b/usb-redir.c index a87de6e..c52311a 100644 --- a/usb-redir.c +++ b/usb-redir.c @@ -447,7 +447,7 @@ static int usbredir_handle_iso_data(USBRedirDevice *dev, USBPacket *p, ERROR("received iso data is larger then packet ep %02X (%d > %d)\n", ep, len, (int)p->iov.size); bufp_free(dev, isop, ep); - return USB_RET_NAK; + return USB_RET_BABBLE; } usb_packet_copy(p, isop->data, len); bufp_free(dev, isop, ep); @@ -566,7 +566,7 @@ static int usbredir_handle_interrupt_data(USBRedirDevice *dev, if (len > p->iov.size) { ERROR("received int data is larger then packet ep %02X\n", ep); bufp_free(dev, intp, ep); - return USB_RET_NAK; + return USB_RET_BABBLE; } usb_packet_copy(p, intp->data, len); bufp_free(dev, intp, ep);