Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
[linux-2.6.git] / drivers / net / wimax / i2400m / usb.c
index d555e37..0d5081d 100644 (file)
@@ -82,6 +82,8 @@ MODULE_PARM_DESC(debug,
 
 /* Our firmware file name */
 static const char *i2400mu_bus_fw_names_5x50[] = {
+#define I2400MU_FW_FILE_NAME_v1_5 "i2400m-fw-usb-1.5.sbcf"
+       I2400MU_FW_FILE_NAME_v1_5,
 #define I2400MU_FW_FILE_NAME_v1_4 "i2400m-fw-usb-1.4.sbcf"
        I2400MU_FW_FILE_NAME_v1_4,
        NULL,
@@ -467,6 +469,13 @@ int i2400mu_probe(struct usb_interface *iface,
        usb_set_intfdata(iface, i2400mu);
 
        i2400m->bus_tx_block_size = I2400MU_BLK_SIZE;
+       /*
+        * Room required in the Tx queue for USB message to accommodate
+        * a smallest payload while allocating header space is 16 bytes.
+        * Adding this room  for the new tx message increases the
+        * possibilities of including any payload with size <= 16 bytes.
+        */
+       i2400m->bus_tx_room_min = I2400MU_BLK_SIZE;
        i2400m->bus_pl_size_max = I2400MU_PL_SIZE_MAX;
        i2400m->bus_setup = NULL;
        i2400m->bus_dev_start = i2400mu_bus_dev_start;
@@ -778,4 +787,5 @@ MODULE_AUTHOR("Intel Corporation <linux-wimax@intel.com>");
 MODULE_DESCRIPTION("Driver for USB based Intel Wireless WiMAX Connection 2400M "
                   "(5x50 & 6050)");
 MODULE_LICENSE("GPL");
-MODULE_FIRMWARE(I2400MU_FW_FILE_NAME_v1_4);
+MODULE_FIRMWARE(I2400MU_FW_FILE_NAME_v1_5);
+MODULE_FIRMWARE(I6050U_FW_FILE_NAME_v1_5);