diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-05-12 02:16:54 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-12 23:10:18 +0400 |
| commit | c80174f3da2f0edec2b66afad673e1f854e8f0ee (patch) | |
| tree | 7d537c5a1fab4ba143738586a4b2617164ec4e5a /include/linux/rndis.h | |
| parent | b101943209e28d8b6a528de26c10e7efeb9fa3b2 (diff) | |
| download | linux-c80174f3da2f0edec2b66afad673e1f854e8f0ee.tar.xz | |
usb/net: rndis: move and namespace PnP defines
This moves the PnP OID definitions to the RNDIS_* namespace
and puts them in the next falling slot in the list. Oh, the comment
above the PnP defines was referring to some obsolete or out-of-tree
driver so removed it, and removed my own comments telling where each
header segment came from as well, we have moved everything around by
this point anyway.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/rndis.h')
| -rw-r--r-- | include/linux/rndis.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/include/linux/rndis.h b/include/linux/rndis.h index 83b3d701de0e..bdad7ab541ea 100644 --- a/include/linux/rndis.h +++ b/include/linux/rndis.h @@ -1,4 +1,7 @@ -/* From include/linux/usb/rndis_host.h */ +/* + * Remote Network Driver Interface Specification (RNDIS) + * definitions of the magic numbers used by this protocol + */ #define RNDIS_MSG_COMPLETION 0x80000000 @@ -148,8 +151,6 @@ #define RNDIS_PACKET_TYPE_FUNCTIONAL 0x00004000 #define RNDIS_PACKET_TYPE_MAC_FRAME 0x00008000 -/* From drivers/usb/gadget/ndis.h */ - /* NDIS_PNP_CAPABILITIES.Flags constants */ #define NDIS_DEVICE_WAKE_UP_ENABLE 0x00000001 #define NDIS_DEVICE_WAKE_ON_PATTERN_MATCH_ENABLE 0x00000002 @@ -194,8 +195,6 @@ #define NDIS_MAC_OPTION_8021P_PRIORITY 0x00000040 #define NDIS_MAC_OPTION_RESERVED 0x80000000 -/* From drivers/usb/gadget/rndis.h */ - /* Remote NDIS Versions */ #define RNDIS_MAJOR_VERSION 0x00000001 #define RNDIS_MINOR_VERSION 0x00000000 @@ -222,16 +221,6 @@ #define RNDIS_DF_CONNECTION_ORIENTED 0x00000002U #define RNDIS_DF_RAW_DATA 0x00000004U -/* from drivers/net/sk98lin/h/skgepnmi.h */ -#define OID_PNP_CAPABILITIES 0xFD010100 -#define OID_PNP_SET_POWER 0xFD010101 -#define OID_PNP_QUERY_POWER 0xFD010102 -#define OID_PNP_ADD_WAKE_UP_PATTERN 0xFD010103 -#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xFD010104 -#define OID_PNP_ENABLE_WAKE_UP 0xFD010106 - -/* From drivers/net/hyperv/hyperv_net.h */ - /* Object Identifiers used by NdisRequest Query/Set Information */ /* General (Required) Objects */ #define RNDIS_OID_GEN_SUPPORTED_LIST 0x00010101 @@ -396,6 +385,14 @@ #define RNDIS_OID_802_11_POWER_MODE 0x0d010216 #define RNDIS_OID_802_11_BSSID_LIST 0x0d010217 +/* Plug and Play capabilities */ +#define RNDIS_OID_PNP_CAPABILITIES 0xFD010100 +#define RNDIS_OID_PNP_SET_POWER 0xFD010101 +#define RNDIS_OID_PNP_QUERY_POWER 0xFD010102 +#define RNDIS_OID_PNP_ADD_WAKE_UP_PATTERN 0xFD010103 +#define RNDIS_OID_PNP_REMOVE_WAKE_UP_PATTERN 0xFD010104 +#define RNDIS_OID_PNP_ENABLE_WAKE_UP 0xFD010106 + #define REMOTE_CONDIS_MP_CREATE_VC_MSG 0x00008001 #define REMOTE_CONDIS_MP_DELETE_VC_MSG 0x00008002 #define REMOTE_CONDIS_MP_ACTIVATE_VC_MSG 0x00008005 |