diff options
| author |   Shuah Khan <shuah.kh@samsung.com> | 2014-03-03 16:38:45 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-04 16:12:14 -0800 |
| commit | cec2e7bb6dff64a166ba5ad50e750424702b4d68 (patch) | |
| tree | 0ec5f298ca6c854981847ccbbb9cdfe2e3b6ccb3 /drivers/staging/usbip | |
| parent | staging/usbip: change usbip to include new uapi usbip.h (diff) | |
| download | linux-dev-cec2e7bb6dff64a166ba5ad50e750424702b4d68.tar.xz linux-dev-cec2e7bb6dff64a166ba5ad50e750424702b4d68.zip | |
staging/usbip: change usbip userspace to include new uapi usbip.h
usbip userspace has duplicated enum definition to report usbip device
status maintained by the kernel. A new uapi usbip.h now defines the
usbip device status for kernel and userspace to use. Change usbip
userspace to include uapi usbip.h for usbip device status.
Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/usbip')
| -rw-r--r-- | drivers/staging/usbip/userspace/libsrc/usbip_common.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_common.h b/drivers/staging/usbip/userspace/libsrc/usbip_common.h index 2cb81b3b35f7..5af59d429114 100644 --- a/drivers/staging/usbip/userspace/libsrc/usbip_common.h +++ b/drivers/staging/usbip/userspace/libsrc/usbip_common.h @@ -15,6 +15,7 @@ #include <syslog.h> #include <unistd.h> #include <linux/usb/ch9.h> +#include "../../uapi/usbip.h" #ifndef USBIDS_FILE #define USBIDS_FILE "/usr/share/hwdata/usb.ids" @@ -77,23 +78,6 @@ extern int usbip_use_debug ; abort(); \ } while (0) -/* FIXME: how to sync with drivers/usbip_common.h ? */ -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 -}; - struct usbip_usb_interface { uint8_t bInterfaceClass; uint8_t bInterfaceSubClass; |