Synchronize with 'net' in order to sort out some l2tp, wireless, and ipv6 GRE fixes that will be built on top of in 'net-next'.
Showing the changes to include/uapi (1 of 266 files). Show all
Unified · Split
| @@ -152,6 +152,12 @@ · 151 unmodified lines | |||
| 152 | #define USB_INTRF_FUNC_SUSPEND_LP (1 << (8 + 0)) | 152 | #define USB_INTRF_FUNC_SUSPEND_LP (1 << (8 + 0)) |
| 153 | #define USB_INTRF_FUNC_SUSPEND_RW (1 << (8 + 1)) | 153 | #define USB_INTRF_FUNC_SUSPEND_RW (1 << (8 + 1)) |
| 154 | 154 | ||
| 155 | /* | ||
| 156 | * Interface status, Figure 9-5 USB 3.0 spec | ||
| 157 | */ | ||
| 158 | #define USB_INTRF_STAT_FUNC_RW_CAP 1 | ||
| 159 | #define USB_INTRF_STAT_FUNC_RW 2 | ||
| 160 | |||
| 155 | #define USB_ENDPOINT_HALT 0 /* IN/OUT will STALL */ | 161 | #define USB_ENDPOINT_HALT 0 /* IN/OUT will STALL */ |
| 156 | 162 | ||
| 157 | /* Bit array elements as returned by the USB_REQ_GET_STATUS request. */ | 163 | /* Bit array elements as returned by the USB_REQ_GET_STATUS request. */ |