Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36ff66db authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: move the definition of USB_MAXCHILDREN 



The USB_MAXCHILDREN symbol is used in include/uapi/linux/usb/ch11.h, a
user-mode header, even though it is defined in include/linux/usb.h,
which is kernel-only.  This causes compile-time errors when user
programs try to #include linux/usb/ch11.h.

This patch fixes the problem by moving the definition of USB_MAXCHILDREN
into ch11.h.  It also gets rid of unneeded parentheses.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 39c24270

include/linux/usb.h

+0 −11
Original line number Diff line number Diff line
@@ -367,17 +367,6 @@ struct usb_bus { 


/* ----------------------------------------------------------------------- */



/* This is arbitrary.

 * From USB 2.0 spec Table 11-13, offset 7, a hub can

 * have up to 255 ports. The most yet reported is 10.

 *

 * Current Wireless USB host hardware (Intel i1480 for example) allows

 * up to 22 devices to connect. Upcoming hardware might raise that

 * limit. Because the arrays need to add a bit for hub status data, we

 * do 31, so plus one evens out to four bytes.

 */

#define USB_MAXCHILDREN		(31)



struct usb_tt;



enum usb_device_removable {

include/uapi/linux/usb/ch11.h

+11 −0
Original line number Diff line number Diff line
@@ -11,6 +11,17 @@ 


#include <linux/types.h>	/* __u8 etc */



/* This is arbitrary.

 * From USB 2.0 spec Table 11-13, offset 7, a hub can

 * have up to 255 ports. The most yet reported is 10.

 *

 * Current Wireless USB host hardware (Intel i1480 for example) allows

 * up to 22 devices to connect. Upcoming hardware might raise that

 * limit. Because the arrays need to add a bit for hub status data, we

 * use 31, so plus one evens out to four bytes.

 */

#define USB_MAXCHILDREN		31



/*

 * Hub request types

 */