[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/21] usb-redir: Limit return values returned by is
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 19/21] usb-redir: Limit return values returned by iso packets |
Date: |
Tue, 28 Feb 2012 11:20:28 +0100 |
From: Hans de Goede <address@hidden>
The usbredir protocol uses a status of usb_redir_stall to indicate that
an iso data stream has stopped (ie because the urbs failed on resubmit),
but iso packets should never return a result of USB_RET_STALL, since iso
endpoints cannot stall. So instead simply always return USB_RET_NAK on
iso stream errors.
Signed-off-by: Hans de Goede <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
usb-redir.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/usb-redir.c b/usb-redir.c
index 6c92fd9..d905463 100644
--- a/usb-redir.c
+++ b/usb-redir.c
@@ -431,7 +431,7 @@ static int usbredir_handle_iso_data(USBRedirDevice *dev,
USBPacket *p,
/* Check iso_error for stream errors, otherwise its an underrun */
status = dev->endpoint[EP2I(ep)].iso_error;
dev->endpoint[EP2I(ep)].iso_error = 0;
- return usbredir_handle_status(dev, status, 0);
+ return status ? USB_RET_NAK : 0;
}
DPRINTF2("iso-token-in ep %02X status %d len %d queue-size: %d\n", ep,
isop->status, isop->len, dev->endpoint[EP2I(ep)].bufpq_size);
@@ -439,7 +439,7 @@ static int usbredir_handle_iso_data(USBRedirDevice *dev,
USBPacket *p,
status = isop->status;
if (status != usb_redir_success) {
bufp_free(dev, isop, ep);
- return usbredir_handle_status(dev, status, 0);
+ return USB_RET_NAK;
}
len = isop->len;
--
1.7.1
- [Qemu-devel] [PATCH 06/21] usb-uhci: implement packet queuing, (continued)
- [Qemu-devel] [PATCH 06/21] usb-uhci: implement packet queuing, Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 08/21] usb: add tracepoint for usb packet state changes., Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 04/21] usb-uhci: add UHCIQueue, Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 07/21] usb-xhci: enable packet queuing, Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 18/21] usb-redir: Let the usb-host know about our device filtering, Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 05/21] usb-uhci: process uhci_handle_td return code via switch., Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 03/21] usb-uhci: cleanup UHCIAsync allocation & initialization., Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 13/21] libcacard: fix reported ATR length, Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 16/21] usb-redir: Fix printing of device version, Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 09/21] usb-ehci: sanity-check iso xfers, Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 19/21] usb-redir: Limit return values returned by iso packets,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 11/21] libcacard: link with glib for g_strndup, Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 10/21] usb-desc: fix user trigerrable segfaults (!config), Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 14/21] usb-ehci: Handle ISO packets failing with an error other then NAK, Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 20/21] usb-redir: Return USB_RET_NAK when we've no data for an interrupt endpoint, Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 21/21] usb: Resolve warnings about unassigned bus on usb device creation, Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 12/21] usb-ccid: advertise SELF_POWERED, Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 17/21] usb-redir: Always clear device state on filter reject, Gerd Hoffmann, 2012/02/28
- [Qemu-devel] [PATCH 15/21] ehci: drop old stuff, Gerd Hoffmann, 2012/02/28
- Re: [Qemu-devel] [PULL] usb patch queue, Anthony Liguori, 2012/02/29