qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Hans de Goede <hdegoede@redhat.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: Hans de Goede <hdegoede@redhat.com>, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 12/13] usb: return BABBLE rather then NAK when we receive too much data
Date: Fri,  2 Mar 2012 19:32:33 +0100	[thread overview]
Message-ID: <1330713154-3229-13-git-send-email-hdegoede@redhat.com> (raw)
In-Reply-To: <1330713154-3229-1-git-send-email-hdegoede@redhat.com>

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 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 ef9fa96..4c8e3e3 100644
--- a/usb-redir.c
+++ b/usb-redir.c
@@ -457,7 +457,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);
@@ -576,7 +576,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);
-- 
1.7.7.6

  parent reply	other threads:[~2012-03-02 19:26 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-02 18:32 [Qemu-devel] [PATCH 0/13] usb patches Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 01/13] usb-redir: Set ep type and interface Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 02/13] usb-ehci: Never follow table entries with the T-bit set Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 03/13] usb-ehci: split our qh queue into async and periodic queues Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 04/13] usb-ehci: always call ehci_queues_rip_unused for period queues Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 05/13] usb-ehci: Drop cached qhs when the doorbell gets rung Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 06/13] usb-ehci: Rip the queues when the async or period schedule is halted Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 07/13] usb-ehci: Any packet completion except for NAK should set the interrupt Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 08/13] usb-ehci: Fix cerr tracking Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 09/13] usb-ehci: Remove dead nakcnt code Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 10/13] usb-ehci: Fix and simplify nakcnt handling Hans de Goede
2012-03-02 18:32 ` [Qemu-devel] [PATCH 11/13] usb-ehci: Cleanup itd error handling Hans de Goede
2012-03-02 18:32 ` Hans de Goede [this message]
2012-03-02 18:32 ` [Qemu-devel] [PATCH 13/13] usb: add USB_RET_IOERROR Hans de Goede
  -- strict thread matches above, loose matches on Subject: below --
2012-03-02 20:27 [Qemu-devel] usb patches [v2] Hans de Goede
2012-03-02 20:27 ` [Qemu-devel] [PATCH 12/13] usb: return BABBLE rather then NAK when we receive too much data Hans de Goede

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1330713154-3229-13-git-send-email-hdegoede@redhat.com \
    --to=hdegoede@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).