cdc_ncm: fix bind failures for Icera devices

The Icera 5AN, 5AN BSD, and Nemo devices are composite devices that
include a NCM interface. Therefore, the NCM match flags should have
the VID, PID, Class, Subclass, and Protocol set to avoid bind()
failures for non-NCM interfaces.

Bug 1197415

Change-Id: If68a6ffaa4e1871c6a22ec8839806949804f502c
Signed-off-by: Neil Patel <neilp@nvidia.com>
Reviewed-on: http://git-master/r/170576
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Steve Lin <stlin@nvidia.com>
Tested-by: Steve Lin <stlin@nvidia.com>
Tested-by: David Norman <dnorman@nvidia.com>

diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index a599498557a3509119c6c700a64dcb693b36cdca..8f6444609af46856916ea09a023c3635307762de 100644 (file)
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -1254,25 +1254,22 @@ static const struct usb_device_id cdc_devs[] = {
 
        /* Icera USB_PROFILE_IAD_5AN */
        {
-               .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
-                       | USB_DEVICE_ID_MATCH_DEVICE,
-               USB_DEVICE(0x1983, 0x0427),
+               USB_DEVICE_AND_INTERFACE_INFO(0x1983, 0x0427, USB_CLASS_COMM,
+                               USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE),
                .driver_info = (unsigned long)&wwan_info,
        },
 
        /* Icera USB_PROFILE_IAD_5AN (BSD) */
        {
-               .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
-                       | USB_DEVICE_ID_MATCH_DEVICE,
-               USB_DEVICE(0x1983, 0x1005),
+               USB_DEVICE_AND_INTERFACE_INFO(0x1983, 0x1005, USB_CLASS_COMM,
+                               USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE),
                .driver_info = (unsigned long)&wwan_info,
        },
 
        /* Icera Nemo */
        {
-               .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
-                       | USB_DEVICE_ID_MATCH_DEVICE,
-               USB_DEVICE(0x1983, 0x1006),
+               USB_DEVICE_AND_INTERFACE_INFO(0x1983, 0x1006, USB_CLASS_COMM,
+                               USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE),
                .driver_info = (unsigned long)&wwan_info,
        },