Message ID | 20110424235930.GA11109@kroah.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Greg KH <greg@kroah.com> Date: Sun, 24 Apr 2011 16:59:30 -0700 > From: Hans Petter Selasky <hselasky@c2i.net> > > The default maximum transmit length for NCM USB frames should be so > that a short packet happens at the end if the device supports a length > greater than the defined maximum. This is achieved by adding 4 bytes > to the maximum length so that the existing logic can fit a short > packet there. > > Signed-off-by: Hans Petter Selasky <hselasky@c2i.net> > Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Applied, thanks Greg. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 967371f..1033ef6 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -54,13 +54,13 @@ #include <linux/usb/usbnet.h> #include <linux/usb/cdc.h> -#define DRIVER_VERSION "7-Feb-2011" +#define DRIVER_VERSION "23-Apr-2011" /* CDC NCM subclass 3.2.1 */ #define USB_CDC_NCM_NDP16_LENGTH_MIN 0x10 /* Maximum NTB length */ -#define CDC_NCM_NTB_MAX_SIZE_TX 16384 /* bytes */ +#define CDC_NCM_NTB_MAX_SIZE_TX (16384 + 4) /* bytes, must be short terminated */ #define CDC_NCM_NTB_MAX_SIZE_RX 16384 /* bytes */ /* Minimum value for MaxDatagramSize, ch. 6.2.9 */