|
@@ -311,10 +311,6 @@ static void option_instat_callback(struct urb *urb);
|
|
|
#define ZTE_PRODUCT_AC2726 0xfff5
|
|
|
#define ZTE_PRODUCT_AC8710T 0xffff
|
|
|
|
|
|
-/* ZTE PRODUCTS -- alternate vendor ID */
|
|
|
-#define ZTE_VENDOR_ID2 0x1d6b
|
|
|
-#define ZTE_PRODUCT_MF_330 0x0002
|
|
|
-
|
|
|
#define BENQ_VENDOR_ID 0x04a5
|
|
|
#define BENQ_PRODUCT_H10 0x4068
|
|
|
|
|
@@ -340,11 +336,12 @@ static void option_instat_callback(struct urb *urb);
|
|
|
#define TOSHIBA_PRODUCT_G450 0x0d45
|
|
|
|
|
|
#define ALINK_VENDOR_ID 0x1e0e
|
|
|
+#define ALINK_PRODUCT_PH300 0x9100
|
|
|
#define ALINK_PRODUCT_3GU 0x9200
|
|
|
|
|
|
/* ALCATEL PRODUCTS */
|
|
|
#define ALCATEL_VENDOR_ID 0x1bbb
|
|
|
-#define ALCATEL_PRODUCT_X060S 0x0000
|
|
|
+#define ALCATEL_PRODUCT_X060S_X200 0x0000
|
|
|
|
|
|
#define PIRELLI_VENDOR_ID 0x1266
|
|
|
#define PIRELLI_PRODUCT_C100_1 0x1002
|
|
@@ -379,6 +376,9 @@ static void option_instat_callback(struct urb *urb);
|
|
|
* It seems to contain a Qualcomm QSC6240/6290 chipset */
|
|
|
#define FOUR_G_SYSTEMS_PRODUCT_W14 0x9603
|
|
|
|
|
|
+/* Zoom */
|
|
|
+#define ZOOM_PRODUCT_4597 0x9607
|
|
|
+
|
|
|
/* Haier products */
|
|
|
#define HAIER_VENDOR_ID 0x201e
|
|
|
#define HAIER_PRODUCT_CE100 0x2009
|
|
@@ -432,6 +432,20 @@ static const struct option_blacklist_info four_g_w14_blacklist = {
|
|
|
.reason = OPTION_BLACKLIST_SENDSETUP
|
|
|
};
|
|
|
|
|
|
+static const u8 alcatel_x200_no_sendsetup[] = { 0, 1 };
|
|
|
+static const struct option_blacklist_info alcatel_x200_blacklist = {
|
|
|
+ .infolen = ARRAY_SIZE(alcatel_x200_no_sendsetup),
|
|
|
+ .ifaceinfo = alcatel_x200_no_sendsetup,
|
|
|
+ .reason = OPTION_BLACKLIST_SENDSETUP
|
|
|
+};
|
|
|
+
|
|
|
+static const u8 zte_k3765_z_no_sendsetup[] = { 0, 1, 2 };
|
|
|
+static const struct option_blacklist_info zte_k3765_z_blacklist = {
|
|
|
+ .infolen = ARRAY_SIZE(zte_k3765_z_no_sendsetup),
|
|
|
+ .ifaceinfo = zte_k3765_z_no_sendsetup,
|
|
|
+ .reason = OPTION_BLACKLIST_SENDSETUP
|
|
|
+};
|
|
|
+
|
|
|
static const struct usb_device_id option_ids[] = {
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
|
|
@@ -916,13 +930,13 @@ static const struct usb_device_id option_ids[] = {
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0073, 0xff, 0xff, 0xff) },
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0130, 0xff, 0xff, 0xff) },
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0141, 0xff, 0xff, 0xff) },
|
|
|
- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff, 0xff, 0xff) },
|
|
|
+ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff,
|
|
|
+ 0xff, 0xff), .driver_info = (kernel_ulong_t)&zte_k3765_z_blacklist },
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2003, 0xff, 0xff, 0xff) },
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) },
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) },
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) },
|
|
|
- { USB_DEVICE(ZTE_VENDOR_ID2, ZTE_PRODUCT_MF_330) },
|
|
|
{ USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
|
|
|
{ USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
|
|
|
{ USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5) }, /* Yes, ALINK_VENDOR_ID */
|
|
@@ -935,13 +949,17 @@ static const struct usb_device_id option_ids[] = {
|
|
|
{ USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_G450) },
|
|
|
{ USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_HSDPA_MINICARD ) }, /* Toshiba 3G HSDPA == Novatel Expedite EU870D MiniCard */
|
|
|
{ USB_DEVICE(ALINK_VENDOR_ID, 0x9000) },
|
|
|
+ { USB_DEVICE(ALINK_VENDOR_ID, ALINK_PRODUCT_PH300) },
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) },
|
|
|
- { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) },
|
|
|
+ { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),
|
|
|
+ .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist
|
|
|
+ },
|
|
|
{ USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
|
|
|
{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
|
|
|
{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
|
|
|
.driver_info = (kernel_ulong_t)&four_g_w14_blacklist
|
|
|
},
|
|
|
+ { USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) },
|
|
|
{ USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
|
|
|
/* Pirelli */
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_C100_1)},
|