Blame 0148-usb-redir-Return-babble-when-getting-more-bulk-data-.patch
|
 |
5544c1b |
From 138e9d997e487dafbf686e0e1eba44a8b26dcaf7 Mon Sep 17 00:00:00 2001
|
|
 |
c8dfc65 |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
c8dfc65 |
Date: Tue, 28 Aug 2012 11:33:47 +0200
|
|
|
5544c1b |
Subject: [PATCH] usb-redir: Return babble when getting more bulk data then
|
|
|
5544c1b |
requested
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
Babble is the appropriate error in this case (rather then signalling a stall).
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
c8dfc65 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
5544c1b |
(cherry picked from commit 2979a36183a3902cd75665e7c6bbc8668668fd17)
|
|
|
5544c1b |
|
|
|
5544c1b |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
c8dfc65 |
---
|
|
|
c8dfc65 |
hw/usb/redirect.c | 6 +++---
|
|
|
c8dfc65 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
|
|
|
5544c1b |
index fd1f8cc..ee75217 100644
|
|
|
c8dfc65 |
--- a/hw/usb/redirect.c
|
|
|
c8dfc65 |
+++ b/hw/usb/redirect.c
|
|
|
5544c1b |
@@ -1324,9 +1324,9 @@ static void usbredir_bulk_packet(void *priv, uint32_t id,
|
|
|
c8dfc65 |
if (data_len <= p->iov.size) {
|
|
|
c8dfc65 |
usb_packet_copy(p, data, data_len);
|
|
|
c8dfc65 |
} else {
|
|
|
c8dfc65 |
- ERROR("bulk buffer too small (%d > %zd)\n", data_len,
|
|
|
c8dfc65 |
- p->iov.size);
|
|
|
c8dfc65 |
- len = USB_RET_STALL;
|
|
|
c8dfc65 |
+ ERROR("bulk got more data then requested (%d > %zd)\n",
|
|
|
c8dfc65 |
+ data_len, p->iov.size);
|
|
|
c8dfc65 |
+ len = USB_RET_BABBLE;
|
|
|
c8dfc65 |
}
|
|
|
c8dfc65 |
}
|
|
|
c8dfc65 |
p->result = len;
|