1 files changed, 19 insertions, 15 deletions

diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index b3b3c05903a1..5512a1038721 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -179,10 +179,8 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf)
          * probed with) and a slave/data interface; union
          * descriptors sort this all out.
          */
-        info->control = usb_ifnum_to_if(dev->udev,
-        info->u->bMasterInterface0);
-        info->data = usb_ifnum_to_if(dev->udev,
-                info->u->bSlaveInterface0);
+        info->control = usb_ifnum_to_if(dev->udev, info->u->bMasterInterface0);
+        info->data = usb_ifnum_to_if(dev->udev, info->u->bSlaveInterface0);
         if (!info->control || !info->data) {
                 dev_dbg(&intf->dev,
                         "master #%u/%p slave #%u/%p\n",
@@ -216,18 +214,16 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf)
         /* a data interface altsetting does the real i/o */
         d = &info->data->cur_altsetting->desc;
         if (d->bInterfaceClass != USB_CLASS_CDC_DATA) {
-                dev_dbg(&intf->dev, "slave class %u\n",
-                        d->bInterfaceClass);
+                dev_dbg(&intf->dev, "slave class %u\n", d->bInterfaceClass);
                 goto bad_desc;
         }
 skip:
-        if (    rndis &&
-                header.usb_cdc_acm_descriptor &&
-                header.usb_cdc_acm_descriptor->bmCapabilities) {
-                        dev_dbg(&intf->dev,
-                                "ACM capabilities %02x, not really RNDIS?\n",
-                                header.usb_cdc_acm_descriptor->bmCapabilities);
-                        goto bad_desc;
+        if (rndis && header.usb_cdc_acm_descriptor &&
+            header.usb_cdc_acm_descriptor->bmCapabilities) {
+                dev_dbg(&intf->dev,
+                        "ACM capabilities %02x, not really RNDIS?\n",
+                        header.usb_cdc_acm_descriptor->bmCapabilities);
+                goto bad_desc;
         }
 
         if (header.usb_cdc_ether_desc && info->ether->wMaxSegmentSize) {
@@ -238,7 +234,7 @@ skip:
         }
 
         if (header.usb_cdc_mdlm_desc &&
-                memcmp(header.usb_cdc_mdlm_desc->bGUID, mbm_guid, 16)) {
+            memcmp(header.usb_cdc_mdlm_desc->bGUID, mbm_guid, 16)) {
                 dev_dbg(&intf->dev, "GUID doesn't match\n");
                 goto bad_desc;
         }
@@ -302,7 +298,7 @@ skip:
         if (info->control->cur_altsetting->desc.bNumEndpoints == 1) {
                 struct usb_endpoint_descriptor  *desc;
 
-                dev->status = &info->control->cur_altsetting->endpoint [0];
+                dev->status = &info->control->cur_altsetting->endpoint[0];
                 desc = &dev->status->desc;
                 if (!usb_endpoint_is_int_in(desc) ||
                     (le16_to_cpu(desc->wMaxPacketSize)
@@ -847,6 +843,14 @@ static const struct usb_device_id	products[] = {
         .driver_info = 0,
 },
 
+/* USB-C 3.1 to 5GBASE-T Ethernet Adapter (based on AQC111U) */
+{
+        USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0xe05a, USB_CLASS_COMM,
+                                      USB_CDC_SUBCLASS_ETHERNET,
+                                      USB_CDC_PROTO_NONE),
+        .driver_info = 0,
+},
+
 /* WHITELIST!!!
  *
  * CDC Ether uses two interfaces, not necessarily consecutive.