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: Alexander Thomas <alexander.thomas@esaturnus.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
index 074ac42..be21617 100644 (file)
--- a/drivers/staging/usbip/usbip_common.h
+++ b/drivers/staging/usbip/usbip_common.h
@@ -126,12 +126,12 @@ extern struct device_attribute dev_attr_usbip_debug;
  *
  */
 #define USBIP_CMD_SUBMIT       0x0001
-#define USBIP_RET_SUBMIT       0x0002
-#define USBIP_CMD_UNLINK       0x0003
+#define USBIP_CMD_UNLINK       0x0002
+#define USBIP_RET_SUBMIT       0x0003
 #define USBIP_RET_UNLINK       0x0004
 
-#define USBIP_DIR_IN   0x00
-#define USBIP_DIR_OUT  0x01
+#define USBIP_DIR_OUT  0x00
+#define USBIP_DIR_IN   0x01
 
 /**
  * struct usbip_header_basic - data pertinent to every request

diff --git a/drivers/staging/usbip/usbip_protocol.txt b/drivers/staging/usbip/usbip_protocol.txt
index 84e353b..0f10208 100644 (file)
--- a/drivers/staging/usbip/usbip_protocol.txt
+++ b/drivers/staging/usbip/usbip_protocol.txt
@@ -243,8 +243,8 @@ USBIP_CMD_SUBMIT: Submit an URB
 -----------+--------+------------+---------------------------------------------------
  8         | 4      |            | devid
 -----------+--------+------------+---------------------------------------------------
- 0xC       | 4      |            | direction: 0: USBIP_DIR_IN
-           |        |            |            1: USBIP_DIR_OUT
+ 0xC       | 4      |            | direction: 0: USBIP_DIR_OUT
+           |        |            |            1: USBIP_DIR_IN
 -----------+--------+------------+---------------------------------------------------
  0x10      | 4      |            | ep: endpoint number, possible values are: 0...15
 -----------+--------+------------+---------------------------------------------------
@@ -285,14 +285,14 @@ USBIP_RET_SUBMIT: Reply for submitting an URB
 
  Offset    | Length | Value      | Description
 -----------+--------+------------+---------------------------------------------------
- 0         | 4      | 0x00000002 | command
+ 0         | 4      | 0x00000003 | command
 -----------+--------+------------+---------------------------------------------------
  4         | 4      |            | seqnum: URB sequence number
 -----------+--------+------------+---------------------------------------------------
  8         | 4      |            | devid
 -----------+--------+------------+---------------------------------------------------
- 0xC       | 4      |            | direction: 0: USBIP_DIR_IN
-           |        |            |            1: USBIP_DIR_OUT
+ 0xC       | 4      |            | direction: 0: USBIP_DIR_OUT
+           |        |            |            1: USBIP_DIR_IN
 -----------+--------+------------+---------------------------------------------------
  0x10      | 4      |            | ep: endpoint number
 -----------+--------+------------+---------------------------------------------------
@@ -318,14 +318,14 @@ USBIP_CMD_UNLINK: Unlink an URB
 
  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?
 -----------+--------+------------+---------------------------------------------------
  8         | 4      |            | devid
 -----------+--------+------------+---------------------------------------------------
- 0xC       | 4      |            | direction: 0: USBIP_DIR_IN
-           |        |            |            1: USBIP_DIR_OUT
+ 0xC       | 4      |            | direction: 0: USBIP_DIR_OUT
+           |        |            |            1: USBIP_DIR_IN
 -----------+--------+------------+---------------------------------------------------
  0x10      | 4      |            | ep: endpoint number: zero
 -----------+--------+------------+---------------------------------------------------
@@ -345,8 +345,8 @@ USBIP_RET_UNLINK: Reply for URB unlink
 -----------+--------+------------+---------------------------------------------------
  8         | 4      |            | devid
 -----------+--------+------------+---------------------------------------------------
- 0xC       | 4      |            | direction: 0: USBIP_DIR_IN
-           |        |            |            1: USBIP_DIR_OUT
+ 0xC       | 4      |            | direction: 0: USBIP_DIR_OUT
+           |        |            |            1: USBIP_DIR_IN
 -----------+--------+------------+---------------------------------------------------
  0x10      | 4      |            | ep: endpoint number
 -----------+--------+------------+---------------------------------------------------