diff options
| author | Shuah Khan | 2014-01-24 19:34:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-02-07 19:55:41 +0100 |
| commit | d1fd43d7a63dea98730b2ac1af829cdb6b3b48c6 (patch) | |
| tree | 12e020cbe60e7da370f82b00afb1cb6ff7a8add1 /drivers/staging/usbip | |
| parent | staging/usbip: simplify usbip_dump_usb_device() udev->speed handling (diff) | |
| download | kernel-qcow2-linux-d1fd43d7a63dea98730b2ac1af829cdb6b3b48c6.tar.gz kernel-qcow2-linux-d1fd43d7a63dea98730b2ac1af829cdb6b3b48c6.tar.xz kernel-qcow2-linux-d1fd43d7a63dea98730b2ac1af829cdb6b3b48c6.zip | |
staging/usbip: userspace to use linux header for usb_device_speed enum, missing speeds to speed_strings array
Remove usb_device_speed enum define from usbip_common.h and change it to
include linux/usb/ch9.h instead. Add speed strings for usb wireless and 3.0
to speed_strings array.
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.c | 2 | ||||
| -rw-r--r-- | drivers/staging/usbip/userspace/libsrc/usbip_common.h | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_common.c b/drivers/staging/usbip/userspace/libsrc/usbip_common.c index 66f03cc62ac6..6620d185d4bf 100644 --- a/drivers/staging/usbip/userspace/libsrc/usbip_common.c +++ b/drivers/staging/usbip/userspace/libsrc/usbip_common.c @@ -23,6 +23,8 @@ static const struct speed_string speed_strings[] = { { USB_SPEED_LOW, "1.5", "Low Speed(1.5Mbps)" }, { USB_SPEED_FULL, "12", "Full Speed(12Mbps)" }, { USB_SPEED_HIGH, "480", "High Speed(480Mbps)" }, + { USB_SPEED_WIRELESS, "53.3-480", "Wireless"}, + { USB_SPEED_SUPER, "5000", "Super Speed(5000Mbps)" }, { 0, NULL, NULL } }; diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_common.h b/drivers/staging/usbip/userspace/libsrc/usbip_common.h index 938ad1c36947..2cb81b3b35f7 100644 --- a/drivers/staging/usbip/userspace/libsrc/usbip_common.h +++ b/drivers/staging/usbip/userspace/libsrc/usbip_common.h @@ -14,6 +14,7 @@ #include <syslog.h> #include <unistd.h> +#include <linux/usb/ch9.h> #ifndef USBIDS_FILE #define USBIDS_FILE "/usr/share/hwdata/usb.ids" @@ -76,13 +77,6 @@ extern int usbip_use_debug ; abort(); \ } while (0) -enum usb_device_speed { - USB_SPEED_UNKNOWN = 0, /* enumerating */ - USB_SPEED_LOW, USB_SPEED_FULL, /* usb 1.1 */ - USB_SPEED_HIGH, /* usb 2.0 */ - USB_SPEED_VARIABLE /* wireless (usb 2.5) */ -}; - /* FIXME: how to sync with drivers/usbip_common.h ? */ enum usbip_device_status { /* sdev is available. */ |