71 lines
2.4 KiB
Diff
71 lines
2.4 KiB
Diff
From 9726556968aef62213b80bd4e351a4f7f721f941 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Thu, 1 Mar 2012 17:22:14 +0100
|
|
Subject: [PATCH 137/140] usb: return BABBLE rather then NAK when we receive
|
|
too much data
|
|
|
|
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 ab4c693..b2d70f9 100644
|
|
--- a/usb-linux.c
|
|
+++ b/usb-linux.c
|
|
@@ -390,6 +390,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;
|
|
@@ -718,6 +722,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;
|
|
}
|
|
@@ -755,7 +761,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 629c87d..61860ef 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.9.3
|
|
|