Merge branch 'master' of git://git.denx.de/u-boot-socfpga

[oweals/u-boot.git] / include / linux / usb / cdc.h

diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h
index 03541cbf219be321a185efed402fe775142baadb..c1d039cb855e446529d9559edd24b0ea96709f8e 100644 (file)
--- a/include/linux/usb/cdc.h
+++ b/include/linux/usb/cdc.h
@@ -9,8 +9,6 @@
  *                      Remy Bohmer <linux@bohmer.net>
  */
 
-
-
 #define USB_CDC_SUBCLASS_ACM                   0x02
 #define USB_CDC_SUBCLASS_ETHERNET              0x06
 #define USB_CDC_SUBCLASS_WHCM                  0x08
@@ -160,6 +158,9 @@ struct usb_cdc_mdlm_detail_desc {
  *
  * section 3.6.2.1 table 4 has the ACM profile, for modems.
  * section 3.8.2 table 10 has the ethernet profile.
+ *
+ * Microsoft's RNDIS stack for Ethernet is a vendor-specific CDC ACM variant,
+ * heavily dependent on the encapsulated (proprietary) command mechanism.
  */
 
 #define USB_CDC_SEND_ENCAPSULATED_COMMAND      0x00
@@ -199,14 +200,14 @@ struct usb_cdc_line_coding {
 #define        USB_CDC_PACKET_TYPE_BROADCAST           (1 << 3)
 #define        USB_CDC_PACKET_TYPE_MULTICAST           (1 << 4) /* filtered */
 
-
 /*-------------------------------------------------------------------------*/
 
 /*
  * Class-Specific Notifications (6.3) sent by interrupt transfers
  *
  * section 3.8.2 table 11 of the CDC spec lists Ethernet notifications
- * section 3.6.2.1 table 5 specifies ACM notifications
+ * section 3.6.2.1 table 5 specifies ACM notifications, accepted by RNDIS
+ * RNDIS also defines its own bit-incompatible notifications
  */
 
 #define USB_CDC_NOTIFY_NETWORK_CONNECTION      0x00
@@ -221,4 +222,3 @@ struct usb_cdc_notification {
        __le16  wIndex;
        __le16  wLength;
 } __attribute__ ((packed));
-