[PATCHv2 1/5] usb: gadget: f_fs: resurect usb_functionfs_descs_head structure

From: Michal Nazarewicz
Date: Fri Jun 06 2014 - 05:13:09 EST


Even though usb_functionfs_descs_head structure is now deprecated,
it has been used by some user space tools. Its removel in commit
[ac8dde1: âAdd flags to descriptors blockâ] was an oversight
leading to build breakage for such tools.

Bring it back so that old user space tools can still be build
without problems on newer kernel versions.

Reported-by: Lad, Prabhakar <prabhakar.csengg@xxxxxxxxx>
Reported-by: Krzysztof Opasiak <k.opasiak@xxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> # 3.14
Signed-off-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
---
include/uapi/linux/usb/functionfs.h | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h
index 2a4b4a7..24b68c5 100644
--- a/include/uapi/linux/usb/functionfs.h
+++ b/include/uapi/linux/usb/functionfs.h
@@ -33,6 +33,13 @@ struct usb_endpoint_descriptor_no_audio {
__u8 bInterval;
} __attribute__((packed));

+/* Legacy format, deprecated as of 3.14. */
+struct usb_functionfs_descs_head {
+ __le32 magic;
+ __le32 length;
+ __le32 fs_count;
+ __le32 hs_count;
+} __attribute__((packed, deprecated));

/*
* Descriptors format:
--
2.0.0.526.g5318336

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/