proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-14 04:54:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb: return BABBLE rather then NAK when we receive too much data

Browse Source 
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2012-03-02 21:27:19 +01:00 committed by Gerd Hoffmann
parent 5eafd438c9
commit 4d819a9bde
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usb-linux.c
View File

@ -364,6 +364,10 @@ static void async_complete(void *opaque)
p->result = USB_RET_STALL; p->result = USB_RET_STALL;
break; break;
case -EOVERFLOW:
p->result = USB_RET_BABBLE;
break;
default: default:
p->result = USB_RET_NAK; p->result = USB_RET_NAK;
break; break;
@ -722,6 +726,8 @@ static int urb_status_to_usb_ret(int status)
switch (status) { switch (status) {
case -EPIPE: case -EPIPE:
return USB_RET_STALL; return USB_RET_STALL;
case -EOVERFLOW:
return USB_RET_BABBLE;
default: default:
return USB_RET_NAK; return USB_RET_NAK;
} }
@ -759,7 +765,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 } else if (aurb[i].urb.iso_frame_desc[j].actual_length
> p->iov.size) { > p->iov.size) {
printf("husb: received iso data is larger then packet\n"); printf("husb: received iso data is larger then packet\n");
len = USB_RET_NAK; len = USB_RET_BABBLE;
/* All good copy data over */ /* All good copy data over */
} else { } else {
len = aurb[i].urb.iso_frame_desc[j].actual_length; len = aurb[i].urb.iso_frame_desc[j].actual_length;

4
usb-redir.c
View File

@ -447,7 +447,7 @@ static int usbredir_handle_iso_data(USBRedirDevice *dev, USBPacket *p,
ERROR("received iso data is larger then packet ep %02X (%d > %d)\n", ERROR("received iso data is larger then packet ep %02X (%d > %d)\n",
ep, len, (int)p->iov.size); ep, len, (int)p->iov.size);
bufp_free(dev, isop, ep); bufp_free(dev, isop, ep);
return USB_RET_NAK; return USB_RET_BABBLE;
} }
usb_packet_copy(p, isop->data, len); usb_packet_copy(p, isop->data, len);
bufp_free(dev, isop, ep); bufp_free(dev, isop, ep);
@ -566,7 +566,7 @@ static int usbredir_handle_interrupt_data(USBRedirDevice *dev,
if (len > p->iov.size) { if (len > p->iov.size) {
ERROR("received int data is larger then packet ep %02X\n", ep); ERROR("received int data is larger then packet ep %02X\n", ep);
bufp_free(dev, intp, ep); bufp_free(dev, intp, ep);
return USB_RET_NAK; return USB_RET_BABBLE;
} }
usb_packet_copy(p, intp->data, len); usb_packet_copy(p, intp->data, len);
bufp_free(dev, intp, ep); bufp_free(dev, intp, ep);