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: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
39c242704c
Коммит
36ff66db3f
|
@ -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;
|
struct usb_tt;
|
||||||
|
|
||||||
enum usb_device_removable {
|
enum usb_device_removable {
|
||||||
|
|
|
@ -11,6 +11,17 @@
|
||||||
|
|
||||||
#include <linux/types.h> /* __u8 etc */
|
#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
|
* Hub request types
|
||||||
*/
|
*/
|
||||||
|
|
Загрузка…
Ссылка в новой задаче