diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-10 08:31:19 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-10 08:31:19 -0600 |
| commit | c62adbee15deae473aa02a37193ddd6b054b0c9f (patch) | |
| tree | 2fe14356f97cd7e3f989b992eacee7adade60414 /hw/usb/dev-network.c | |
| parent | e49d021e574c3ee8e443bcc84d1fb7dfb4c87c42 (diff) | |
| parent | 427e3aa151c749225364d0c30640e2e3c1756d9d (diff) | |
| download | focaccia-qemu-c62adbee15deae473aa02a37193ddd6b054b0c9f.tar.gz focaccia-qemu-c62adbee15deae473aa02a37193ddd6b054b0c9f.zip | |
Merge remote-tracking branch 'kraxel/usb.74' into staging
* kraxel/usb.74: usb-tablet: Allow connecting to ehci ehci: Lower timer freq when the periodic schedule is idle usb: Allow overriding of usb_desc at the device level usb: Don't allow USB_RET_ASYNC for interrupt packets usb: Call wakeup when data becomes available for all devices with int eps add pc-1.4 Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/usb/dev-network.c')
| -rw-r--r-- | hw/usb/dev-network.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 14d9e5aa5b..30cb03373e 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -639,6 +639,8 @@ typedef struct USBNetState { unsigned int in_ptr, in_len; uint8_t in_buf[2048]; + USBEndpoint *intr; + char usbstring_mac[13]; NICState *nic; NICConf conf; @@ -851,6 +853,10 @@ static void *rndis_queue_response(USBNetState *s, unsigned int length) struct rndis_response *r = g_malloc0(sizeof(struct rndis_response) + length); + if (QTAILQ_EMPTY(&s->rndis_resp)) { + usb_wakeup(s->intr); + } + QTAILQ_INSERT_TAIL(&s->rndis_resp, r, entries); r->length = length; @@ -1349,6 +1355,7 @@ static int usb_net_initfn(USBDevice *dev) s->media_state = 0; /* NDIS_MEDIA_STATE_CONNECTED */; s->filter = 0; s->vendorid = 0x1234; + s->intr = usb_ep_get(dev, USB_TOKEN_IN, 1); qemu_macaddr_default_if_unset(&s->conf.macaddr); s->nic = qemu_new_nic(&net_usbnet_info, &s->conf, |