summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Petter Selasky <hselasky@c2i.net>2011-04-24 22:35:19 -0700
committerDavid S. Miller <davem@davemloft.net>2011-04-24 22:35:19 -0700
commit8c61d9d611cb5b290f1b4ac57c4631acfd6e3b5a (patch)
tree0e8d3f1c5d9d8bc34d238e739ea57cd098560924
parent9ac067a84efbc7f5570d4d93c3b303001d5e8b38 (diff)
downloadlinux-8c61d9d611cb5b290f1b4ac57c4631acfd6e3b5a.tar.gz
linux-8c61d9d611cb5b290f1b4ac57c4631acfd6e3b5a.tar.bz2
linux-8c61d9d611cb5b290f1b4ac57c4631acfd6e3b5a.zip
cdc_ncm: fix short packet issue on some devices
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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/usb/cdc_ncm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 967371f04454..1033ef6476a4 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 */