From 91338d1b4df14f7454d1b52200d2ae4eb957fa72 Mon Sep 17 00:00:00 2001

From: Hans de Goede <hdegoede@redhat.com>

Date: Sun, 26 Feb 2012 15:28:51 +0100

Subject: [PATCH 124/140] usb-redir: Limit return values returned by iso

 packets

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 <hdegoede@redhat.com>

---

 usb-redir.c |    4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usb-redir.c b/usb-redir.c

index d10d8de..c76e55d 100644

--- a/usb-redir.c

+++ b/usb-redir.c

@@ -441,7 +441,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);

@@ -449,7 +449,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.9.3