From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Brownell Subject: [RESEND patch 2.6.25-rc2-git] rndis_host: fix transfer size negotiation Date: Thu, 13 Mar 2008 14:56:36 -0800 Message-ID: <200803131556.36960.david-b@pacbell.net> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Cc: "Jean-Christophe Dubois" To: Network development list Return-path: Received: from smtp107.sbc.mail.mud.yahoo.com ([68.142.198.206]:49120 "HELO smtp107.sbc.mail.mud.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756799AbYCMW4k (ORCPT ); Thu, 13 Mar 2008 18:56:40 -0400 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: From: Jean-Christophe Dubois This patch should resolve a problem that's troubled support for some RNDIS peripherals. It seems to have boiled down to using a variable to establish transfer size limits before it was assigned, which caused those devices to fallback to a default "jumbogram" mode we don't support. Fix by assigning it earlier for RNDIS. Signed-off-by: Jean-Christophe Dubois [ cleanups ] Signed-off-by: David Brownell --- This bugfix should be merged before 2.6.25-final. drivers/net/usb/rndis_host.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) --- g26.orig/drivers/net/usb/rndis_host.c 2008-02-01 22:24:38.000000000 -0800 +++ g26/drivers/net/usb/rndis_host.c 2008-02-16 12:55:35.000000000 -0800 @@ -16,10 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -// #define DEBUG // error path messages, extra info -// #define VERBOSE // more; success messages - #include #include #include @@ -318,6 +314,14 @@ generic_rndis_bind(struct usbnet *dev, s net->hard_header_len += sizeof (struct rndis_data_hdr); dev->hard_mtu = net->mtu + net->hard_header_len; + dev->maxpacket = usb_maxpacket(dev->udev, dev->out, 1); + if (dev->maxpacket == 0) { + if (netif_msg_probe(dev)) + dev_dbg(&intf->dev, "dev->maxpacket can't be 0\n"); + retval = -EINVAL; + goto fail_and_release; + } + dev->rx_urb_size = dev->hard_mtu + (dev->maxpacket + 1); dev->rx_urb_size &= ~(dev->maxpacket - 1); u.init->max_transfer_size = cpu_to_le32(dev->rx_urb_size);