68 lines
2.4 KiB
Diff
68 lines
2.4 KiB
Diff
From c767c83ab8061664dcd6ea05b692c2acf0efb27f 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] 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 749ce71..9987a2c 100644
|
|
--- a/usb-linux.c
|
|
+++ b/usb-linux.c
|
|
@@ -391,6 +391,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;
|
|
@@ -729,6 +733,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;
|
|
}
|
|
@@ -766,7 +772,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 d10be6f..7313140 100644
|
|
--- a/usb-redir.c
|
|
+++ b/usb-redir.c
|
|
@@ -456,7 +456,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);
|
|
@@ -575,7 +575,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);
|