From: Bjørn Mork Date: Wed, 19 Dec 2012 14:15:17 +0000 (+0100) Subject: UPSTREAM: USB: option: blacklist network interface on ZTE MF880 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=aea811d6005e33e14d965fdf7e2468efb63d6bcf UPSTREAM: USB: option: blacklist network interface on ZTE MF880 The driver description files gives these names to the vendor specific functions on this modem: diag: VID_19D2&PID_0284&MI_00 nmea: VID_19D2&PID_0284&MI_01 at: VID_19D2&PID_0284&MI_02 mdm: VID_19D2&PID_0284&MI_03 net: VID_19D2&PID_0284&MI_04 Signed-off-by: Bjørn Mork Cc: stable Signed-off-by: Greg Kroah-Hartman (cherry picked from commit fab38246f318edcd0dcb8fd3852a47cf8938878a) Change-Id: If40a3ca9fffaa28660ea3982fef57ac0a4e4f53d Signed-off-by: Ben Chan Reviewed-on: https://gerrit.chromium.org/gerrit/50572 Reviewed-by: Olof Johansson --- diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 23ced3cd744d..549a99c4d7f5 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -908,7 +908,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0257, 0xff, 0xff, 0xff), /* ZTE MF821 */ .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff) }, - { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff), /* ZTE MF880 */ + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0317, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0326, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf4_blacklist },