diff options
-rw-r--r-- | drivers/net/usb/cdc_ether.c | 63 |
1 files changed, 17 insertions, 46 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index c36b1c3c5b19..2023f3ea891e 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
@@ -665,58 +665,33 @@ static const struct usb_device_id products[] = { | |||
665 | */ | 665 | */ |
666 | { | 666 | { |
667 | /* ZTE (Vodafone) K3805-Z */ | 667 | /* ZTE (Vodafone) K3805-Z */ |
668 | .match_flags = USB_DEVICE_ID_MATCH_VENDOR | 668 | USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1003, USB_CLASS_COMM, |
669 | | USB_DEVICE_ID_MATCH_PRODUCT | 669 | USB_CDC_SUBCLASS_ETHERNET, |
670 | | USB_DEVICE_ID_MATCH_INT_INFO, | 670 | USB_CDC_PROTO_NONE), |
671 | .idVendor = ZTE_VENDOR_ID, | ||
672 | .idProduct = 0x1003, | ||
673 | .bInterfaceClass = USB_CLASS_COMM, | ||
674 | .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, | ||
675 | .bInterfaceProtocol = USB_CDC_PROTO_NONE, | ||
676 | .driver_info = (unsigned long)&wwan_info, | 671 | .driver_info = (unsigned long)&wwan_info, |
677 | }, { | 672 | }, { |
678 | /* ZTE (Vodafone) K3806-Z */ | 673 | /* ZTE (Vodafone) K3806-Z */ |
679 | .match_flags = USB_DEVICE_ID_MATCH_VENDOR | 674 | USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1015, USB_CLASS_COMM, |
680 | | USB_DEVICE_ID_MATCH_PRODUCT | 675 | USB_CDC_SUBCLASS_ETHERNET, |
681 | | USB_DEVICE_ID_MATCH_INT_INFO, | 676 | USB_CDC_PROTO_NONE), |
682 | .idVendor = ZTE_VENDOR_ID, | ||
683 | .idProduct = 0x1015, | ||
684 | .bInterfaceClass = USB_CLASS_COMM, | ||
685 | .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, | ||
686 | .bInterfaceProtocol = USB_CDC_PROTO_NONE, | ||
687 | .driver_info = (unsigned long)&wwan_info, | 677 | .driver_info = (unsigned long)&wwan_info, |
688 | }, { | 678 | }, { |
689 | /* ZTE (Vodafone) K4510-Z */ | 679 | /* ZTE (Vodafone) K4510-Z */ |
690 | .match_flags = USB_DEVICE_ID_MATCH_VENDOR | 680 | USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1173, USB_CLASS_COMM, |
691 | | USB_DEVICE_ID_MATCH_PRODUCT | 681 | USB_CDC_SUBCLASS_ETHERNET, |
692 | | USB_DEVICE_ID_MATCH_INT_INFO, | 682 | USB_CDC_PROTO_NONE), |
693 | .idVendor = ZTE_VENDOR_ID, | ||
694 | .idProduct = 0x1173, | ||
695 | .bInterfaceClass = USB_CLASS_COMM, | ||
696 | .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, | ||
697 | .bInterfaceProtocol = USB_CDC_PROTO_NONE, | ||
698 | .driver_info = (unsigned long)&wwan_info, | 683 | .driver_info = (unsigned long)&wwan_info, |
699 | }, { | 684 | }, { |
700 | /* ZTE (Vodafone) K3770-Z */ | 685 | /* ZTE (Vodafone) K3770-Z */ |
701 | .match_flags = USB_DEVICE_ID_MATCH_VENDOR | 686 | USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1177, USB_CLASS_COMM, |
702 | | USB_DEVICE_ID_MATCH_PRODUCT | 687 | USB_CDC_SUBCLASS_ETHERNET, |
703 | | USB_DEVICE_ID_MATCH_INT_INFO, | 688 | USB_CDC_PROTO_NONE), |
704 | .idVendor = ZTE_VENDOR_ID, | ||
705 | .idProduct = 0x1177, | ||
706 | .bInterfaceClass = USB_CLASS_COMM, | ||
707 | .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, | ||
708 | .bInterfaceProtocol = USB_CDC_PROTO_NONE, | ||
709 | .driver_info = (unsigned long)&wwan_info, | 689 | .driver_info = (unsigned long)&wwan_info, |
710 | }, { | 690 | }, { |
711 | /* ZTE (Vodafone) K3772-Z */ | 691 | /* ZTE (Vodafone) K3772-Z */ |
712 | .match_flags = USB_DEVICE_ID_MATCH_VENDOR | 692 | USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1181, USB_CLASS_COMM, |
713 | | USB_DEVICE_ID_MATCH_PRODUCT | 693 | USB_CDC_SUBCLASS_ETHERNET, |
714 | | USB_DEVICE_ID_MATCH_INT_INFO, | 694 | USB_CDC_PROTO_NONE), |
715 | .idVendor = ZTE_VENDOR_ID, | ||
716 | .idProduct = 0x1181, | ||
717 | .bInterfaceClass = USB_CLASS_COMM, | ||
718 | .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, | ||
719 | .bInterfaceProtocol = USB_CDC_PROTO_NONE, | ||
720 | .driver_info = (unsigned long)&wwan_info, | 695 | .driver_info = (unsigned long)&wwan_info, |
721 | }, { | 696 | }, { |
722 | /* Telit modules */ | 697 | /* Telit modules */ |
@@ -734,12 +709,8 @@ static const struct usb_device_id products[] = { | |||
734 | 709 | ||
735 | }, { | 710 | }, { |
736 | /* Various Huawei modems with a network port like the UMG1831 */ | 711 | /* Various Huawei modems with a network port like the UMG1831 */ |
737 | .match_flags = USB_DEVICE_ID_MATCH_VENDOR | 712 | USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_COMM, |
738 | | USB_DEVICE_ID_MATCH_INT_INFO, | 713 | USB_CDC_SUBCLASS_ETHERNET, 255), |
739 | .idVendor = HUAWEI_VENDOR_ID, | ||
740 | .bInterfaceClass = USB_CLASS_COMM, | ||
741 | .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, | ||
742 | .bInterfaceProtocol = 255, | ||
743 | .driver_info = (unsigned long)&wwan_info, | 714 | .driver_info = (unsigned long)&wwan_info, |
744 | }, | 715 | }, |
745 | { }, /* END */ | 716 | { }, /* END */ |