diff options
author | Richard Kennedy <richard@rsk.demon.co.uk> | 2012-07-10 17:19:25 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 17:21:29 -0700 |
commit | 0d5ff306582834e3172365d619ec0cfe7a4f79ba (patch) | |
tree | 9b0209eac32cdac83cd65aecd254e0fef5a3b45d /include/linux/usb.h | |
parent | 09110529780890804b22e997ae6b4fe3f0b3b158 (diff) | |
download | linux-stable-0d5ff306582834e3172365d619ec0cfe7a4f79ba.tar.gz linux-stable-0d5ff306582834e3172365d619ec0cfe7a4f79ba.tar.bz2 linux-stable-0d5ff306582834e3172365d619ec0cfe7a4f79ba.zip |
USB: remove 8 bytes of padding from usb_host_interface on 64 bit builds
Reorder elements in the usb_host_interface structure to remove 8 bytes
of padding on 64 bit builds , and so shrink it's size to 40 bytes.
usb_interface_descriptor is a odd size which leaves a gap that is not
big enough to hold a pointer, so moving extralen into that gap removes
the need for more padding.
Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r-- | include/linux/usb.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index f8506ed0f97b..873956bec25e 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -77,14 +77,15 @@ struct usb_host_endpoint { struct usb_host_interface { struct usb_interface_descriptor desc; + int extralen; + unsigned char *extra; /* Extra descriptors */ + /* array of desc.bNumEndpoint endpoints associated with this * interface setting. these will be in no particular order. */ struct usb_host_endpoint *endpoint; char *string; /* iInterface string, if present */ - unsigned char *extra; /* Extra descriptors */ - int extralen; }; enum usb_interface_condition { |