diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-03-02 21:27:19 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-03-07 12:28:04 +0100 |
| commit | 4d819a9bde7f52e7421d4128dc69c296c9fd017a (patch) | |
| tree | 999f0d21e6853682a9e44b8a8599717576998b57 | |
| parent | 5eafd438c9e3b7b698c4a4ec755f52d8dfb870ae (diff) | |
usb: return BABBLE rather then NAK when we receive too much data
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | usb-linux.c | 8 | ||||
| -rw-r--r-- | usb-redir.c | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/usb-linux.c b/usb-linux.c index 47994f3ceb..38df9e613e 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 a87de6e348..c52311ac02 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); |