diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/linux/usb/rndis_host.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/linux/usb/rndis_host.h')
| -rw-r--r-- | include/linux/usb/rndis_host.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb/rndis_host.h b/include/linux/usb/rndis_host.h index 05ef52861988..88fceb718c77 100644 --- a/include/linux/usb/rndis_host.h +++ b/include/linux/usb/rndis_host.h | |||
| @@ -256,6 +256,8 @@ struct rndis_keepalive_c { /* IN (optionally OUT) */ | |||
| 256 | #define FLAG_RNDIS_PHYM_NOT_WIRELESS 0x0001 | 256 | #define FLAG_RNDIS_PHYM_NOT_WIRELESS 0x0001 |
| 257 | #define FLAG_RNDIS_PHYM_WIRELESS 0x0002 | 257 | #define FLAG_RNDIS_PHYM_WIRELESS 0x0002 |
| 258 | 258 | ||
| 259 | /* Flags for driver_info::data */ | ||
| 260 | #define RNDIS_DRIVER_DATA_POLL_STATUS 1 /* poll status before control */ | ||
| 259 | 261 | ||
| 260 | extern void rndis_status(struct usbnet *dev, struct urb *urb); | 262 | extern void rndis_status(struct usbnet *dev, struct urb *urb); |
| 261 | extern int | 263 | extern int |