Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Merge net into net-next to setup some infrastructure Eric Dumazet needs for usbnet changes.

David S. Miller committed 13 years ago

Commit 0e76a3a2 parents fba3679 72a67a9906 files · +11262 −98600Browse files

Showing the changes to include/uapi/linux (3 of 906 files). Show all

Unified · Split

3 files

@@ -215,8 +215,8 @@ struct fw_cdev_event_request2 { · 214 unmodified lines
215	* with the %FW_CDEV_ISO_INTERRUPT bit set, when explicitly requested with	215	* with the %FW_CDEV_ISO_INTERRUPT bit set, when explicitly requested with
216	* %FW_CDEV_IOC_FLUSH_ISO, or when there have been so many completed packets	216	* %FW_CDEV_IOC_FLUSH_ISO, or when there have been so many completed packets
217	* without the interrupt bit set that the kernel's internal buffer for @header	217	* without the interrupt bit set that the kernel's internal buffer for @header
218	* is about to overflow. (In the last case, kernels with ABI version < 5 drop	218	* is about to overflow. (In the last case, ABI versions < 5 drop header data
219	* header data up to the next interrupt packet.)	219	* up to the next interrupt packet.)
220	*	220	*
221	* Isochronous transmit events (context type %FW_CDEV_ISO_CONTEXT_TRANSMIT):	221	* Isochronous transmit events (context type %FW_CDEV_ISO_CONTEXT_TRANSMIT):
222	*	222	*

@@ -69,8 +69,8 @@ · 68 unmodified lines
69	* starting a poll from a device which has a secure element enabled means	69	* starting a poll from a device which has a secure element enabled means
70	* we want to do SE based card emulation.	70	* we want to do SE based card emulation.
71	* @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element.	71	* @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element.
72	* @NFC_CMD_FW_UPLOAD: Request to Load/flash firmware, or event to inform that	72	* @NFC_CMD_FW_DOWNLOAD: Request to Load/flash firmware, or event to inform
73	* some firmware was loaded	73	* that some firmware was loaded
74	*/	74	*/
75	enum nfc_commands {	75	enum nfc_commands {
76	NFC_CMD_UNSPEC,	76	NFC_CMD_UNSPEC,
@@ -94,7 +94,7 @@ enum nfc_commands { · 17 unmodified lines
94	NFC_CMD_DISABLE_SE,	94	NFC_CMD_DISABLE_SE,
95	NFC_CMD_LLC_SDREQ,	95	NFC_CMD_LLC_SDREQ,
96	NFC_EVENT_LLC_SDRES,	96	NFC_EVENT_LLC_SDRES,
97	NFC_CMD_FW_UPLOAD,	97	NFC_CMD_FW_DOWNLOAD,
98	NFC_EVENT_SE_ADDED,	98	NFC_EVENT_SE_ADDED,
99	NFC_EVENT_SE_REMOVED,	99	NFC_EVENT_SE_REMOVED,
100	/* private: internal use only */	100	/* private: internal use only */

@@ -11,6 +11,17 @@ · 10 unmodified lines
11		11
12	#include <linux/types.h> /* __u8 etc */	12	#include <linux/types.h> /* __u8 etc */
13		13
		14	/* This is arbitrary.
		15	* From USB 2.0 spec Table 11-13, offset 7, a hub can
		16	* have up to 255 ports. The most yet reported is 10.
		17	*
		18	* Current Wireless USB host hardware (Intel i1480 for example) allows
		19	* up to 22 devices to connect. Upcoming hardware might raise that
		20	* limit. Because the arrays need to add a bit for hub status data, we
		21	* use 31, so plus one evens out to four bytes.
		22	*/
		23	#define USB_MAXCHILDREN 31
		24
14	/*	25	/*
15	* Hub request types	26	* Hub request types
16	*/	27	*/