diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2010-07-02 21:47:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-02 21:47:54 -0700 |
| commit | 7b00ac51ffcda994ef0839001257be894cc6e5a8 (patch) | |
| tree | b19052580692616aaddefed434515aebe5e4568b /drivers/net/usb | |
| parent | c89827e0e9346c039aed9b63c14096c2d36796b1 (diff) | |
| download | kernel_samsung_smdk4412-7b00ac51ffcda994ef0839001257be894cc6e5a8.tar.gz kernel_samsung_smdk4412-7b00ac51ffcda994ef0839001257be894cc6e5a8.tar.bz2 kernel_samsung_smdk4412-7b00ac51ffcda994ef0839001257be894cc6e5a8.zip | |
net: Revert "rndis_host: Poll status channel before control channel"
This reverts commit c17b274dc2aa538b68c1f02b01a3c4e124b435ba.
That change was reported to break rndis_wlan support for the WUSB54GS.
Reported-by: Luís Picciochi Oliveira <pitxyoki@gmail.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/rndis_host.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 28d3ee175e7..dd8a4adf48c 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c @@ -104,10 +104,8 @@ static void rndis_msg_indicate(struct usbnet *dev, struct rndis_indicate *msg, int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen) { struct cdc_state *info = (void *) &dev->data; - struct usb_cdc_notification notification; int master_ifnum; int retval; - int partial; unsigned count; __le32 rsp; u32 xid = 0, msg_len, request_id; @@ -135,17 +133,13 @@ int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen) if (unlikely(retval < 0 || xid == 0)) return retval; - /* Some devices don't respond on the control channel until - * polled on the status channel, so do that first. */ - retval = usb_interrupt_msg( - dev->udev, - usb_rcvintpipe(dev->udev, dev->status->desc.bEndpointAddress), - ¬ification, sizeof(notification), &partial, - RNDIS_CONTROL_TIMEOUT_MS); - if (unlikely(retval < 0)) - return retval; + // FIXME Seems like some devices discard responses when + // we time out and cancel our "get response" requests... + // so, this is fragile. Probably need to poll for status. - /* Poll the control channel; the request probably completed immediately */ + /* ignore status endpoint, just poll the control channel; + * the request probably completed immediately + */ rsp = buf->msg_type | RNDIS_MSG_COMPLETION; for (count = 0; count < 10; count++) { memset(buf, 0, CONTROL_BUFFER_SIZE); |