rndis_host: fix transfer size negotiation
Subsystems (3)
PATCH RESEND 1/1 rndis_host: fix transfer size negotiation
From: Jean-Christophe Dubois <[email protected]>
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.
---
This bugfix should be merged before 2.6.25-final.
drivers/net/usb/rndis_host.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/usb/rndis_host.c +8 -4
@@ -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 <linux/module.h> #include <linux/init.h> #include <linux/netdevice.h>
@@ -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);
Jeff Garzik
AppliedQuoted 8 lines · David Brownell
From: Jean-Christophe Dubois <[email protected]>
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.
Quoted 8 lines
Signed-off-by Jean-Christophe Dubois <[email protected]>[ cleanups ]Signed-off-by David Brownell <[email protected]>---
This bugfix should be merged before 2.6.25-final.drivers/net/usb/rndis_host.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
applied