1 files changed, 24 insertions, 5 deletions

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 73c7df489607..d3d0c1374334 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -292,6 +292,16 @@ struct usb_host_config {
         int extralen;
 };
 
+/* USB2.0 and USB3.0 device BOS descriptor set */
+struct usb_host_bos {
+        struct usb_bos_descriptor       *desc;
+
+        /* wireless cap descriptor is handled by wusb */
+        struct usb_ext_cap_descriptor   *ext_cap;
+        struct usb_ss_cap_descriptor    *ss_cap;
+        struct usb_ss_container_id_descriptor   *ss_id;
+};
+
 int __usb_get_extra_descriptor(char *buffer, unsigned size,
         unsigned char type, void **ptr);
 #define usb_get_extra_descriptor(ifpoint, type, ptr) \
@@ -381,6 +391,7 @@ struct usb_tt;
  * @ep0: endpoint 0 data (default control pipe)
  * @dev: generic device interface
  * @descriptor: USB device descriptor
+ * @bos: USB device BOS descriptor set
  * @config: all of the device's configs
  * @actconfig: the active configuration
  * @ep_in: array of IN endpoints
@@ -399,6 +410,9 @@ struct usb_tt;
  *      FIXME -- complete doc
  * @authenticated: Crypto authentication passed
  * @wusb: device is Wireless USB
+ * @lpm_capable: device supports LPM
+ * @usb2_hw_lpm_capable: device can perform USB2 hardware LPM
+ * @usb2_hw_lpm_enabled: USB2 hardware LPM enabled
  * @string_langid: language ID for strings
  * @product: iProduct string, if present (static)
  * @manufacturer: iManufacturer string, if present (static)
@@ -442,6 +456,7 @@ struct usb_device {
         struct device dev;
 
         struct usb_device_descriptor descriptor;
+        struct usb_host_bos *bos;
         struct usb_host_config *config;
 
         struct usb_host_config *actconfig;
@@ -460,6 +475,9 @@ struct usb_device {
         unsigned authorized:1;
         unsigned authenticated:1;
         unsigned wusb:1;
+        unsigned lpm_capable:1;
+        unsigned usb2_hw_lpm_capable:1;
+        unsigned usb2_hw_lpm_enabled:1;
         int string_langid;
 
         /* static strings from the device */
@@ -928,10 +946,11 @@ struct usb_class_driver {
  */
 extern int usb_register_driver(struct usb_driver *, struct module *,
                                const char *);
-static inline int usb_register(struct usb_driver *driver)
-{
-        return usb_register_driver(driver, THIS_MODULE, KBUILD_MODNAME);
-}
+
+/* use a define to avoid include chaining to get THIS_MODULE & friends */
+#define usb_register(driver) \
+        usb_register_driver(driver, THIS_MODULE, KBUILD_MODNAME)
+
 extern void usb_deregister(struct usb_driver *);
 
 extern int usb_register_device_driver(struct usb_device_driver *,
@@ -1574,7 +1593,7 @@ usb_maxpacket(struct usb_device *udev, int pipe, int is_out)
                 return 0;
 
         /* NOTE:  only 0x07ff bits are for packet size... */
-        return le16_to_cpu(ep->desc.wMaxPacketSize);
+        return usb_endpoint_maxp(&ep->desc);
 }
 
 /* ----------------------------------------------------------------------- */