From faad94349d7e9bfb1e824f010730841cb3712836 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 17 Dec 2012 08:19:46 +0000 Subject: [PATCH] --- yaml --- r: 347311 b: refs/heads/master c: c39ba1c2bdc3f97839d9b9e6bf9ffd5c754b7f95 h: refs/heads/master i: 347309: 1ccbf8487702353d2496619a6d417a97f68317f8 347307: 702f7330da0aff0d2d67822afb7aeb4b84724066 347303: 605c1229b82fc427f038b9c6c987ec354f430838 347295: 84ebe6715e663404ac17d4c76cee738f272f3488 v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/cdc_ether.c | 20 ++++---------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 22a6d7146a4a..71a84135470b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0370acd4d4d2595a11b0b0a793acb506e19b9d4c +refs/heads/master: c39ba1c2bdc3f97839d9b9e6bf9ffd5c754b7f95 diff --git a/trunk/drivers/net/usb/cdc_ether.c b/trunk/drivers/net/usb/cdc_ether.c index c4c593dcf0ba..a74f35f1403d 100644 --- a/trunk/drivers/net/usb/cdc_ether.c +++ b/trunk/drivers/net/usb/cdc_ether.c @@ -595,27 +595,15 @@ static const struct usb_device_id products [] = { /* Novatel USB551L and MC551 - handled by qmi_wwan */ { - .match_flags = USB_DEVICE_ID_MATCH_VENDOR - | USB_DEVICE_ID_MATCH_PRODUCT - | USB_DEVICE_ID_MATCH_INT_INFO, - .idVendor = NOVATEL_VENDOR_ID, - .idProduct = 0xB001, - .bInterfaceClass = USB_CLASS_COMM, - .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, - .bInterfaceProtocol = USB_CDC_PROTO_NONE, + USB_DEVICE_AND_INTERFACE_INFO(NOVATEL_VENDOR_ID, 0xB001, USB_CLASS_COMM, + USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), .driver_info = 0, }, /* Novatel E362 - handled by qmi_wwan */ { - .match_flags = USB_DEVICE_ID_MATCH_VENDOR - | USB_DEVICE_ID_MATCH_PRODUCT - | USB_DEVICE_ID_MATCH_INT_INFO, - .idVendor = NOVATEL_VENDOR_ID, - .idProduct = 0x9010, - .bInterfaceClass = USB_CLASS_COMM, - .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, - .bInterfaceProtocol = USB_CDC_PROTO_NONE, + USB_DEVICE_AND_INTERFACE_INFO(NOVATEL_VENDOR_ID, 0x9010, USB_CLASS_COMM, + USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), .driver_info = 0, },