[PATCH] knfsd: Convert sunrpc_cache to use krefs

[linux-2.6-omap-h63xx.git] / include / linux / usb_cdc.h

diff --git a/include/linux/usb_cdc.h b/include/linux/usb_cdc.h
index 1b68c122279a82826aea36f02c80edb2fed384b6..ba617c3724552a91bca0147b8150b8ddad549691 100644 (file)
--- a/include/linux/usb_cdc.h
+++ b/include/linux/usb_cdc.h
@@ -34,6 +34,7 @@
 #define USB_CDC_ACM_TYPE               0x02            /* acm_descriptor */
 #define USB_CDC_UNION_TYPE             0x06            /* union_desc */
 #define USB_CDC_COUNTRY_TYPE           0x07
+#define USB_CDC_NETWORK_TERMINAL_TYPE  0x0a            /* network_terminal_desc */
 #define USB_CDC_ETHERNET_TYPE          0x0f            /* ether_desc */
 #define USB_CDC_WHCM_TYPE              0x11
 #define USB_CDC_MDLM_TYPE              0x12            /* mdlm_desc */
@@ -83,6 +84,18 @@ struct usb_cdc_union_desc {
        /* ... and there could be other slave interfaces */
 } __attribute__ ((packed));
 
+/* "Network Channel Terminal Functional Descriptor" from CDC spec 5.2.3.11 */
+struct usb_cdc_network_terminal_desc {
+       __u8    bLength;
+       __u8    bDescriptorType;
+       __u8    bDescriptorSubType;
+
+       __u8    bEntityId;
+       __u8    iName;
+       __u8    bChannelIndex;
+       __u8    bPhysicalInterface;
+} __attribute__ ((packed));
+
 /* "Ethernet Networking Functional Descriptor" from CDC spec 5.2.3.16 */
 struct usb_cdc_ether_desc {
        __u8    bLength;
@@ -114,7 +127,7 @@ struct usb_cdc_mdlm_detail_desc {
 
        /* type is associated with mdlm_desc.bGUID */
        __u8    bGuidDescriptorType;
-       __u8    bDetailData[];
+       __u8    bDetailData[0];
 } __attribute__ ((packed));
 
 /*-------------------------------------------------------------------------*/