Option.c blacklist not functioning as I expected
Subsystems (2)
Guys,
I wanted to blacklist a network interface that has class 0xff / subclass
0xff from the Option usb serial driver for a couple of devices. The reason for doing this is I hope to get the usbnet driver running on interface 1. The 'blacklist_info' in option.c looked like the way to go, but it doesn't seem to have the desired effect, I still get interface 1 bound. Interfaces 4 and 5 aren't bound but I suspect it's because they are storage and not class 0xff.
Please can anyone show me what I'm missing?
Thanks,
Andrew
drivers/usb/serial/option.c +2 -0
@@ -145,6 +145,8 @@ static void option_instat_callback(struct urb *urb);#define HUAWEI_PRODUCT_E143D 0x143D#define HUAWEI_PRODUCT_E143E 0x143E#define HUAWEI_PRODUCT_E143F 0x143F +#define HUAWEI_PRODUCT_K4505 0x1464 +#define HUAWEI_PRODUCT_K3765 0x1465#define HUAWEI_PRODUCT_E14AC 0x14AC#define QUANTA_VENDOR_ID 0x0408
@@ -383,6 +385,14 @@ static const struct option_blacklist_info
four_g_w14_blacklist = {
.reason = OPTION_BLACKLIST_SENDSETUP
};
+/* ignore net, cdrom, sdcard interfaces */
+static const u8 huawei_k3765_k4505_reserved_if[] = { 1, 4, 5}; +static const struct option_blacklist_info huawei_k3765_k4505_blacklist = {
+ .infolen = ARRAY_SIZE(huawei_k3765_k4505_reserved_if), + .ifaceinfo = huawei_k3765_k4505_reserved_if, + .reason = OPTION_BLACKLIST_RESERVED_IF
+};
+
static const struct usb_device_id option_ids[] = {
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -480,6 +490,12 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID,HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID,HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID,HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },
+ { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505),
+ .driver_info = (kernel_ulong_t)&huawei_k3765_k4505_blacklist
+ },
+ { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765),
+ .driver_info = (kernel_ulong_t)&huawei_k3765_k4505_blacklist
+ },
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) },
{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) },
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640)
}, /* Novatel Merlin V640/XV620 */
Quoted 58 lines · Andrew Bird (Sphere Systems)
Guys,
I wanted to blacklist a network interface that has class 0xff /subclass
0xfffrom the Option usb serial driver for a couple of devices. The reason for doing this is I hope to get the usbnet driver running on interface 1. The 'blacklist_info' inoption.clooked like the way to go, but it doesn't seem to have the desired effect, I still get interface 1 bound. Interfaces 4 and 5 aren't bound but I suspect it's because they are storage and not class0xff.Please can anyone show me what I'm missing?
Thanks,
Andrew
drivers/usb/serial/option.c +10
-0@@ -145,6 +145,8 @@ static void option_instat_callback(struct urb *urb);#define HUAWEI_PRODUCT_E143D 0x143D#define HUAWEI_PRODUCT_E143E 0x143E#define HUAWEI_PRODUCT_E143F 0x143F +#define HUAWEI_PRODUCT_K4505 0x1464 +#define HUAWEI_PRODUCT_K3765 0x1465#define HUAWEI_PRODUCT_E14AC 0x14AC#define QUANTA_VENDOR_ID 0x0408@@ -383,6 +385,14 @@ static const struct option_blacklist_info four_g_w14_blacklist = { .reason =OPTION_BLACKLIST_SENDSETUP }; +/* ignore net, cdrom, sdcard interfaces */ +static const u8 huawei_k3765_k4505_reserved_if[] = {1 ,4 ,5 }; +static const struct option_blacklist_info huawei_k3765_k4505_blacklist = { + .infolen =ARRAY_SIZE (huawei_k3765_k4505_reserved_if), + .ifaceinfo = huawei_k3765_k4505_reserved_if, + .reason =OPTION_BLACKLIST_RESERVED_IF +}; +static const struct usb_device_id option_ids[] = { {USB_DEVICE (OPTION_VENDOR_ID ,OPTION_PRODUCT_COLT ) },{
USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA)},drivers/usb/serial/option.c +6
-0@@ -480,6 +490,12 @@ static const struct usb_device_id option_ids[] = { {USB_DEVICE_AND_INTERFACE_INFO (HUAWEI_VENDOR_ID , HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) }, + { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505), + .driver_info = (kernel_ulong_t)&huawei_k3765_k4505_blacklist + }, + { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765), + .driver_info = (kernel_ulong_t)&huawei_k3765_k4505_blacklist + },
Quoted 4 lines
{
USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC)}, {USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508)}, { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */
It seems the original urb setup function that called is_blacklisted() has gone away, here's how it looked
http://www.spinics.net/lists/linux-usb/msg26392.html
To me it looks like urb setup has moved to usb-wwan.c, how should a method to ignore a specific interface be re-added?