On Fri, 2010-04-09 at 02:08 +0100, Ben Hutchings wrote: > Mandriva has a single patch to rndis_host; initially I thought was > irrelevant but now I realise it must be responsible: > <http://svn.mandriva.com/svn/packages/updates/2010.0/kernel/current/PATCHES/patches/net-usb-rndis-lite-samsung.patch> > > The patch correctly describes itself as being a hack. I believe the > attached patch to Linux 2.6.32 will achieve the same effect cleanly > (i.e. it could be accepted in Linux mainline and used by all > distributions). Please test it, following the instructions at > <http://kernel-handbook.alioth.debian.org/ch-common-tasks.html#s-common-official>. > Make sure you have an APT 'deb-src' line for lenny-backports first. Well that was weird - I wrote 'attached'. forgot to attach the file but didn't get a warning about it. This time there really is an attachment. Ben. -- Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.
From 1c941691a933e9c2d0314c9b84ea77b6ef2807e1 Mon Sep 17 00:00:00 2001 From: Ben Hutchings <ben@decadent.org.uk> Date: Fri, 9 Apr 2010 01:55:27 +0100 Subject: [PATCH] rndis_host: Poll status channel before control channel --- drivers/net/usb/rndis_host.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index f56dec6..52faca1 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c @@ -103,8 +103,10 @@ 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; @@ -132,13 +134,17 @@ int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen) if (unlikely(retval < 0 || xid == 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. + /* 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; - /* ignore status endpoint, just poll the control channel; - * the request probably completed immediately - */ + /* 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); -- 1.7.0.3
Attachment:
signature.asc
Description: This is a digitally signed message part