Commit 007e5c8e authored by Linus Walleij's avatar Linus Walleij Committed by David S. Miller
Browse files

usb/net: rndis: remove ambigous status codes 



The RNDIS status codes are redefined with much stranged ifdeffery
and only one of these codes was used in the hyperv driver, and
there it is very clearly referring to the RNDIS variant, not some
other status. So clarify this by explictly using the RNDIS_*
prefixed status code in the hyperv drivera and delete the
duplicate defines.

Reviewed-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7591157e

drivers/net/hyperv/rndis_filter.c

+2 −2
Original line number Diff line number Diff line
@@ -267,11 +267,11 @@ static void rndis_filter_receive_response(struct rndis_device *dev, 
			    REMOTE_NDIS_RESET_CMPLT) {

				/* does not have a request id field */

				request->response_msg.msg.reset_complete.

					status = STATUS_BUFFER_OVERFLOW;

					status = RNDIS_STATUS_BUFFER_OVERFLOW;

			} else {

				request->response_msg.msg.

				init_complete.status =

					STATUS_BUFFER_OVERFLOW;

					RNDIS_STATUS_BUFFER_OVERFLOW;

			}

		}

include/linux/rndis.h

+3 −28
Original line number Diff line number Diff line
@@ -268,32 +268,7 @@ 
/* From drivers/net/hyperv/hyperv_net.h */



/*  Status codes */



#ifndef STATUS_SUCCESS

#define STATUS_SUCCESS				(0x00000000L)

#endif



#ifndef STATUS_UNSUCCESSFUL

#define STATUS_UNSUCCESSFUL			(0xC0000001L)

#endif



#ifndef STATUS_PENDING

#define STATUS_PENDING				(0x00000103L)

#endif



#ifndef STATUS_INSUFFICIENT_RESOURCES

#define STATUS_INSUFFICIENT_RESOURCES		(0xC000009AL)

#endif



#ifndef STATUS_BUFFER_OVERFLOW

#define STATUS_BUFFER_OVERFLOW			(0x80000005L)

#endif



#ifndef STATUS_NOT_SUPPORTED

#define STATUS_NOT_SUPPORTED			(0xC00000BBL)

#endif



#define RNDIS_STATUS_PENDING			(STATUS_PENDING)

#define RNDIS_STATUS_PENDING			(0x00000103L)

#define RNDIS_STATUS_NOT_RECOGNIZED		(0x00010001L)

#define RNDIS_STATUS_NOT_COPIED			(0x00010002L)

#define RNDIS_STATUS_NOT_ACCEPTED		(0x00010003L)
@@ -318,9 +293,9 @@ 
#define RNDIS_STATUS_NOT_RESETTABLE		(0x80010001L)

#define RNDIS_STATUS_SOFT_ERRORS		(0x80010003L)

#define RNDIS_STATUS_HARD_ERRORS		(0x80010004L)

#define RNDIS_STATUS_BUFFER_OVERFLOW		(STATUS_BUFFER_OVERFLOW)

#define RNDIS_STATUS_BUFFER_OVERFLOW		(0x80000005L)



#define RNDIS_STATUS_RESOURCES			(STATUS_INSUFFICIENT_RESOURCES)

#define RNDIS_STATUS_RESOURCES			(0xC000009AL)

#define RNDIS_STATUS_CLOSING			(0xC0010002L)

#define RNDIS_STATUS_BAD_VERSION		(0xC0010004L)

#define RNDIS_STATUS_BAD_CHARACTERISTICS	(0xC0010005L)

CRA Git | Maintained and supported by SUSTech CRA and CCSE