Commit 7518b9b8 authored by Alexander Thomas's avatar Alexander Thomas Committed by Greg Kroah-Hartman

staging: usbip: fix up api changes that broke windows clients

Revert changes in definitions that were submitted on May 11 2011 and
committed on June 7 2011. No reason for the change in these values was
given in the patch comment, it broke compatibility with older
versions, and was difficult to detect by the simultaneous move of the
lines of code.
Signed-off-by: default avatarAlexander Thomas <alexander.thomas@esaturnus.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 14739fee
...@@ -126,12 +126,12 @@ extern struct device_attribute dev_attr_usbip_debug; ...@@ -126,12 +126,12 @@ extern struct device_attribute dev_attr_usbip_debug;
* *
*/ */
#define USBIP_CMD_SUBMIT 0x0001 #define USBIP_CMD_SUBMIT 0x0001
#define USBIP_RET_SUBMIT 0x0002 #define USBIP_CMD_UNLINK 0x0002
#define USBIP_CMD_UNLINK 0x0003 #define USBIP_RET_SUBMIT 0x0003
#define USBIP_RET_UNLINK 0x0004 #define USBIP_RET_UNLINK 0x0004
#define USBIP_DIR_IN 0x00 #define USBIP_DIR_OUT 0x00
#define USBIP_DIR_OUT 0x01 #define USBIP_DIR_IN 0x01
/** /**
* struct usbip_header_basic - data pertinent to every request * struct usbip_header_basic - data pertinent to every request
......
...@@ -243,8 +243,8 @@ USBIP_CMD_SUBMIT: Submit an URB ...@@ -243,8 +243,8 @@ USBIP_CMD_SUBMIT: Submit an URB
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
8 | 4 | | devid 8 | 4 | | devid
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
0xC | 4 | | direction: 0: USBIP_DIR_IN 0xC | 4 | | direction: 0: USBIP_DIR_OUT
| | | 1: USBIP_DIR_OUT | | | 1: USBIP_DIR_IN
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
0x10 | 4 | | ep: endpoint number, possible values are: 0...15 0x10 | 4 | | ep: endpoint number, possible values are: 0...15
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
...@@ -285,14 +285,14 @@ USBIP_RET_SUBMIT: Reply for submitting an URB ...@@ -285,14 +285,14 @@ USBIP_RET_SUBMIT: Reply for submitting an URB
Offset | Length | Value | Description Offset | Length | Value | Description
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
0 | 4 | 0x00000002 | command 0 | 4 | 0x00000003 | command
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
4 | 4 | | seqnum: URB sequence number 4 | 4 | | seqnum: URB sequence number
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
8 | 4 | | devid 8 | 4 | | devid
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
0xC | 4 | | direction: 0: USBIP_DIR_IN 0xC | 4 | | direction: 0: USBIP_DIR_OUT
| | | 1: USBIP_DIR_OUT | | | 1: USBIP_DIR_IN
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
0x10 | 4 | | ep: endpoint number 0x10 | 4 | | ep: endpoint number
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
...@@ -318,14 +318,14 @@ USBIP_CMD_UNLINK: Unlink an URB ...@@ -318,14 +318,14 @@ USBIP_CMD_UNLINK: Unlink an URB
Offset | Length | Value | Description Offset | Length | Value | Description
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
0 | 4 | 0x00000003 | command: URB unlink command 0 | 4 | 0x00000002 | command: URB unlink command
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
4 | 4 | | seqnum: URB sequence number to unlink: FIXME: is this so? 4 | 4 | | seqnum: URB sequence number to unlink: FIXME: is this so?
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
8 | 4 | | devid 8 | 4 | | devid
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
0xC | 4 | | direction: 0: USBIP_DIR_IN 0xC | 4 | | direction: 0: USBIP_DIR_OUT
| | | 1: USBIP_DIR_OUT | | | 1: USBIP_DIR_IN
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
0x10 | 4 | | ep: endpoint number: zero 0x10 | 4 | | ep: endpoint number: zero
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
...@@ -345,8 +345,8 @@ USBIP_RET_UNLINK: Reply for URB unlink ...@@ -345,8 +345,8 @@ USBIP_RET_UNLINK: Reply for URB unlink
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
8 | 4 | | devid 8 | 4 | | devid
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
0xC | 4 | | direction: 0: USBIP_DIR_IN 0xC | 4 | | direction: 0: USBIP_DIR_OUT
| | | 1: USBIP_DIR_OUT | | | 1: USBIP_DIR_IN
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
0x10 | 4 | | ep: endpoint number 0x10 | 4 | | ep: endpoint number
-----------+--------+------------+--------------------------------------------------- -----------+--------+------------+---------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment