usb/net: rndis: group all status codes together

Move all RNDIS status codes so they appear in rising order and
in one place of the header file.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/rndis.h b/include/linux/rndis.h
index 70bd80a..2e0b1bd 100644 (file)
--- a/include/linux/rndis.h
+++ b/include/linux/rndis.h
@@ -20,15 +20,85 @@
 #define RNDIS_MSG_KEEPALIVE    0x00000008
 #define RNDIS_MSG_KEEPALIVE_C  (RNDIS_MSG_KEEPALIVE|RNDIS_MSG_COMPLETION)
 
-
 /* codes for "status" field of completion messages */
 #define        RNDIS_STATUS_SUCCESS                    0x00000000
-#define        RNDIS_STATUS_FAILURE                    0xc0000001
-#define        RNDIS_STATUS_INVALID_DATA               0xc0010015
-#define        RNDIS_STATUS_NOT_SUPPORTED              0xc00000bb
-#define        RNDIS_STATUS_MEDIA_CONNECT              0x4001000b
-#define        RNDIS_STATUS_MEDIA_DISCONNECT           0x4001000c
+#define RNDIS_STATUS_PENDING                   0x00000103
+
+/*  Status codes */
+#define RNDIS_STATUS_NOT_RECOGNIZED            0x00010001
+#define RNDIS_STATUS_NOT_COPIED                        0x00010002
+#define RNDIS_STATUS_NOT_ACCEPTED              0x00010003
+#define RNDIS_STATUS_CALL_ACTIVE               0x00010007
+
+#define RNDIS_STATUS_ONLINE                    0x40010003
+#define RNDIS_STATUS_RESET_START               0x40010004
+#define RNDIS_STATUS_RESET_END                 0x40010005
+#define RNDIS_STATUS_RING_STATUS               0x40010006
+#define RNDIS_STATUS_CLOSED                    0x40010007
+#define RNDIS_STATUS_WAN_LINE_UP               0x40010008
+#define RNDIS_STATUS_WAN_LINE_DOWN             0x40010009
+#define RNDIS_STATUS_WAN_FRAGMENT              0x4001000A
+#define        RNDIS_STATUS_MEDIA_CONNECT              0x4001000B
+#define        RNDIS_STATUS_MEDIA_DISCONNECT           0x4001000C
+#define RNDIS_STATUS_HARDWARE_LINE_UP          0x4001000D
+#define RNDIS_STATUS_HARDWARE_LINE_DOWN                0x4001000E
+#define RNDIS_STATUS_INTERFACE_UP              0x4001000F
+#define RNDIS_STATUS_INTERFACE_DOWN            0x40010010
+#define RNDIS_STATUS_MEDIA_BUSY                        0x40010011
 #define        RNDIS_STATUS_MEDIA_SPECIFIC_INDICATION  0x40010012
+#define RNDIS_STATUS_WW_INDICATION             RDIA_SPECIFIC_INDICATION
+#define RNDIS_STATUS_LINK_SPEED_CHANGE         0x40010013L
+
+#define RNDIS_STATUS_NOT_RESETTABLE            0x80010001
+#define RNDIS_STATUS_SOFT_ERRORS               0x80010003
+#define RNDIS_STATUS_HARD_ERRORS               0x80010004
+#define RNDIS_STATUS_BUFFER_OVERFLOW           0x80000005
+
+#define        RNDIS_STATUS_FAILURE                    0xC0000001
+#define RNDIS_STATUS_RESOURCES                 0xC000009A
+#define        RNDIS_STATUS_NOT_SUPPORTED              0xc00000BB
+#define RNDIS_STATUS_CLOSING                   0xC0010002
+#define RNDIS_STATUS_BAD_VERSION               0xC0010004
+#define RNDIS_STATUS_BAD_CHARACTERISTICS       0xC0010005
+#define RNDIS_STATUS_ADAPTER_NOT_FOUND         0xC0010006
+#define RNDIS_STATUS_OPEN_FAILED               0xC0010007
+#define RNDIS_STATUS_DEVICE_FAILED             0xC0010008
+#define RNDIS_STATUS_MULTICAST_FULL            0xC0010009
+#define RNDIS_STATUS_MULTICAST_EXISTS          0xC001000A
+#define RNDIS_STATUS_MULTICAST_NOT_FOUND       0xC001000B
+#define RNDIS_STATUS_REQUEST_ABORTED           0xC001000C
+#define RNDIS_STATUS_RESET_IN_PROGRESS         0xC001000D
+#define RNDIS_STATUS_CLOSING_INDICATING                0xC001000E
+#define RNDIS_STATUS_INVALID_PACKET            0xC001000F
+#define RNDIS_STATUS_OPEN_LIST_FULL            0xC0010010
+#define RNDIS_STATUS_ADAPTER_NOT_READY         0xC0010011
+#define RNDIS_STATUS_ADAPTER_NOT_OPEN          0xC0010012
+#define RNDIS_STATUS_NOT_INDICATING            0xC0010013
+#define RNDIS_STATUS_INVALID_LENGTH            0xC0010014
+#define        RNDIS_STATUS_INVALID_DATA               0xC0010015
+#define RNDIS_STATUS_BUFFER_TOO_SHORT          0xC0010016
+#define RNDIS_STATUS_INVALID_OID               0xC0010017
+#define RNDIS_STATUS_ADAPTER_REMOVED           0xC0010018
+#define RNDIS_STATUS_UNSUPPORTED_MEDIA         0xC0010019
+#define RNDIS_STATUS_GROUP_ADDRESS_IN_USE      0xC001001A
+#define RNDIS_STATUS_FILE_NOT_FOUND            0xC001001B
+#define RNDIS_STATUS_ERROR_READING_FILE                0xC001001C
+#define RNDIS_STATUS_ALREADY_MAPPED            0xC001001D
+#define RNDIS_STATUS_RESOURCE_CONFLICT         0xC001001E
+#define RNDIS_STATUS_NO_CABLE                  0xC001001F
+
+#define RNDIS_STATUS_INVALID_SAP               0xC0010020
+#define RNDIS_STATUS_SAP_IN_USE                        0xC0010021
+#define RNDIS_STATUS_INVALID_ADDRESS           0xC0010022
+#define RNDIS_STATUS_VC_NOT_ACTIVATED          0xC0010023
+#define RNDIS_STATUS_DEST_OUT_OF_ORDER         0xC0010024
+#define RNDIS_STATUS_VC_NOT_AVAILABLE          0xC0010025
+#define RNDIS_STATUS_CELLRATE_NOT_AVAILABLE    0xC0010026
+#define RNDIS_STATUS_INCOMPATABLE_QOS          0xC0010027
+#define RNDIS_STATUS_AAL_PARAMS_UNSUPPORTED    0xC0010028
+#define RNDIS_STATUS_NO_ROUTE_TO_DESTINATION   0xC0010029
+
+#define RNDIS_STATUS_TOKEN_RING_OPEN_ERROR     0xC0011000
 
 /* codes for RNDIS_OID_GEN_PHYSICAL_MEDIUM */
 #define        RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED       0x00000000
@@ -139,10 +209,6 @@
 #define RNDIS_MAJOR_VERSION            0x00000001
 #define RNDIS_MINOR_VERSION            0x00000000
 
-/* For all not specified status messages:
- * RNDIS_STATUS_Xxx -> NDIS_STATUS_Xxx
- */
-
 /* Message Set for Connectionless (802.3) Devices */
 #define REMOTE_NDIS_PACKET_MSG         0x00000001U
 #define REMOTE_NDIS_INITIALIZE_MSG     0x00000002U     /* Initialize device */
@@ -175,77 +241,6 @@
 
 /* From drivers/net/hyperv/hyperv_net.h */
 
-/*  Status codes */
-#define RNDIS_STATUS_PENDING                   (0x00000103L)
-#define RNDIS_STATUS_NOT_RECOGNIZED            (0x00010001L)
-#define RNDIS_STATUS_NOT_COPIED                        (0x00010002L)
-#define RNDIS_STATUS_NOT_ACCEPTED              (0x00010003L)
-#define RNDIS_STATUS_CALL_ACTIVE               (0x00010007L)
-
-#define RNDIS_STATUS_ONLINE                    (0x40010003L)
-#define RNDIS_STATUS_RESET_START               (0x40010004L)
-#define RNDIS_STATUS_RESET_END                 (0x40010005L)
-#define RNDIS_STATUS_RING_STATUS               (0x40010006L)
-#define RNDIS_STATUS_CLOSED                    (0x40010007L)
-#define RNDIS_STATUS_WAN_LINE_UP               (0x40010008L)
-#define RNDIS_STATUS_WAN_LINE_DOWN             (0x40010009L)
-#define RNDIS_STATUS_WAN_FRAGMENT              (0x4001000AL)
-#define RNDIS_STATUS_HARDWARE_LINE_UP          (0x4001000DL)
-#define RNDIS_STATUS_HARDWARE_LINE_DOWN                (0x4001000EL)
-#define RNDIS_STATUS_INTERFACE_UP              (0x4001000FL)
-#define RNDIS_STATUS_INTERFACE_DOWN            (0x40010010L)
-#define RNDIS_STATUS_MEDIA_BUSY                        (0x40010011L)
-#define RNDIS_STATUS_WW_INDICATION             RDIA_SPECIFIC_INDICATION
-#define RNDIS_STATUS_LINK_SPEED_CHANGE         (0x40010013L)
-
-#define RNDIS_STATUS_NOT_RESETTABLE            (0x80010001L)
-#define RNDIS_STATUS_SOFT_ERRORS               (0x80010003L)
-#define RNDIS_STATUS_HARD_ERRORS               (0x80010004L)
-#define RNDIS_STATUS_BUFFER_OVERFLOW           (0x80000005L)
-
-#define RNDIS_STATUS_RESOURCES                 (0xC000009AL)
-#define RNDIS_STATUS_CLOSING                   (0xC0010002L)
-#define RNDIS_STATUS_BAD_VERSION               (0xC0010004L)
-#define RNDIS_STATUS_BAD_CHARACTERISTICS       (0xC0010005L)
-#define RNDIS_STATUS_ADAPTER_NOT_FOUND         (0xC0010006L)
-#define RNDIS_STATUS_OPEN_FAILED               (0xC0010007L)
-#define RNDIS_STATUS_DEVICE_FAILED             (0xC0010008L)
-#define RNDIS_STATUS_MULTICAST_FULL            (0xC0010009L)
-#define RNDIS_STATUS_MULTICAST_EXISTS          (0xC001000AL)
-#define RNDIS_STATUS_MULTICAST_NOT_FOUND       (0xC001000BL)
-#define RNDIS_STATUS_REQUEST_ABORTED           (0xC001000CL)
-#define RNDIS_STATUS_RESET_IN_PROGRESS         (0xC001000DL)
-#define RNDIS_STATUS_CLOSING_INDICATING                (0xC001000EL)
-#define RNDIS_STATUS_INVALID_PACKET            (0xC001000FL)
-#define RNDIS_STATUS_OPEN_LIST_FULL            (0xC0010010L)
-#define RNDIS_STATUS_ADAPTER_NOT_READY         (0xC0010011L)
-#define RNDIS_STATUS_ADAPTER_NOT_OPEN          (0xC0010012L)
-#define RNDIS_STATUS_NOT_INDICATING            (0xC0010013L)
-#define RNDIS_STATUS_INVALID_LENGTH            (0xC0010014L)
-#define RNDIS_STATUS_BUFFER_TOO_SHORT          (0xC0010016L)
-#define RNDIS_STATUS_INVALID_OID               (0xC0010017L)
-#define RNDIS_STATUS_ADAPTER_REMOVED           (0xC0010018L)
-#define RNDIS_STATUS_UNSUPPORTED_MEDIA         (0xC0010019L)
-#define RNDIS_STATUS_GROUP_ADDRESS_IN_USE      (0xC001001AL)
-#define RNDIS_STATUS_FILE_NOT_FOUND            (0xC001001BL)
-#define RNDIS_STATUS_ERROR_READING_FILE                (0xC001001CL)
-#define RNDIS_STATUS_ALREADY_MAPPED            (0xC001001DL)
-#define RNDIS_STATUS_RESOURCE_CONFLICT         (0xC001001EL)
-#define RNDIS_STATUS_NO_CABLE                  (0xC001001FL)
-
-#define RNDIS_STATUS_INVALID_SAP               (0xC0010020L)
-#define RNDIS_STATUS_SAP_IN_USE                        (0xC0010021L)
-#define RNDIS_STATUS_INVALID_ADDRESS           (0xC0010022L)
-#define RNDIS_STATUS_VC_NOT_ACTIVATED          (0xC0010023L)
-#define RNDIS_STATUS_DEST_OUT_OF_ORDER         (0xC0010024L)
-#define RNDIS_STATUS_VC_NOT_AVAILABLE          (0xC0010025L)
-#define RNDIS_STATUS_CELLRATE_NOT_AVAILABLE    (0xC0010026L)
-#define RNDIS_STATUS_INCOMPATABLE_QOS          (0xC0010027L)
-#define RNDIS_STATUS_AAL_PARAMS_UNSUPPORTED    (0xC0010028L)
-#define RNDIS_STATUS_NO_ROUTE_TO_DESTINATION   (0xC0010029L)
-
-#define RNDIS_STATUS_TOKEN_RING_OPEN_ERROR     (0xC0011000L)
-
 /* Object Identifiers used by NdisRequest Query/Set Information */
 /* General (Required) Objects */
 #define RNDIS_OID_GEN_SUPPORTED_LIST           0x00010101