diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-31 08:17:15 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-31 08:17:15 -0500 |
| commit | f590f4c4b6b1adcbcec1780f85466ea10c8c6123 (patch) | |
| tree | 7556b92742bc8804b4d9c9108d4e4166a426be7b /hw/usb-net.c | |
| parent | 2eb9f241824d000fcd90bd7f4b49e40b88e62975 (diff) | |
| parent | 94527ead7e9f4c6bc193754000a61b15939e6c1e (diff) | |
| download | focaccia-qemu-f590f4c4b6b1adcbcec1780f85466ea10c8c6123.tar.gz focaccia-qemu-f590f4c4b6b1adcbcec1780f85466ea10c8c6123.zip | |
Merge remote-tracking branch 'kraxel/usb.14.pull' into staging
Diffstat (limited to 'hw/usb-net.c')
| -rw-r--r-- | hw/usb-net.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/usb-net.c b/hw/usb-net.c index bf51bb3890..9be709f7cf 100644 --- a/hw/usb-net.c +++ b/hw/usb-net.c @@ -1042,13 +1042,13 @@ static void usb_net_handle_reset(USBDevice *dev) { } -static int usb_net_handle_control(USBDevice *dev, int request, int value, - int index, int length, uint8_t *data) +static int usb_net_handle_control(USBDevice *dev, USBPacket *p, + int request, int value, int index, int length, uint8_t *data) { USBNetState *s = (USBNetState *) dev; int ret; - ret = usb_desc_handle_control(dev, request, value, index, length, data); + ret = usb_desc_handle_control(dev, p, request, value, index, length, data); if (ret >= 0) { return ret; } |