forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
David S. Miller 2014-09-07 21:41:53 -07:00
commit eb84d6b604
694 changed files with 6362 additions and 3447 deletions
Download patch file Download diff file Expand all files Collapse all files

26
include/uapi/linux/usbip.h Normal file
View file

@ -0,0 +1,26 @@
/*
* usbip.h
*
* USBIP uapi defines and function prototypes etc.
*/
#ifndef _UAPI_LINUX_USBIP_H
#define _UAPI_LINUX_USBIP_H
/* usbip device status - exported in usbip device sysfs status */
enum usbip_device_status {
/* sdev is available. */
SDEV_ST_AVAILABLE = 0x01,
/* sdev is now used. */
SDEV_ST_USED,
/* sdev is unusable because of a fatal error. */
SDEV_ST_ERROR,
/* vdev does not connect a remote device. */
VDEV_ST_NULL,
/* vdev is used, but the USB address is not assigned yet */
VDEV_ST_NOTASSIGNED,
VDEV_ST_USED,
VDEV_ST_ERROR
};
#endif /* _UAPI_LINUX_USBIP_H */

2
include/uapi/linux/xattr.h
View file

@ -13,7 +13,7 @@
#ifndef _UAPI_LINUX_XATTR_H
#define _UAPI_LINUX_XATTR_H
#ifdef __UAPI_DEF_XATTR
#if __UAPI_DEF_XATTR
#define __USE_KERNEL_XATTR_DEFS
#define XATTR_CREATE 0x1 /* set value, fail if attr already exists */