diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-05-11 18:15:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-12 15:02:22 -0400 |
commit | 7591157e1848b5db900b34016e2a2182329a93bb (patch) | |
tree | 47b1a5cfd7f4f1162831638d5be4514b3b8bc74b /drivers/net/wireless/rndis_wlan.c | |
parent | 7390e8b0dee778b0a964337558990a91094e679a (diff) |
usb/net: rndis: break out <linux/rndis.h> defines
As a first step to consolidate the RNDIS implementations, break out
a common file with all the #defines and move it to <linux/rndis.h>.
This also deletes the immediate duplicated defines in the
<linux/rndis.h> file that yields a lot of compilation warnings.
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/rndis_wlan.c')
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index cd828e3b8e40..dc3caba2c18b 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -88,49 +88,6 @@ module_param_named(workaround_interval, modparam_workaround_interval, | |||
88 | MODULE_PARM_DESC(workaround_interval, | 88 | MODULE_PARM_DESC(workaround_interval, |
89 | "set stall workaround interval in msecs (0=disabled) (default: 0)"); | 89 | "set stall workaround interval in msecs (0=disabled) (default: 0)"); |
90 | 90 | ||
91 | |||
92 | /* various RNDIS OID defs */ | ||
93 | #define OID_GEN_LINK_SPEED 0x00010107 | ||
94 | #define OID_GEN_RNDIS_CONFIG_PARAMETER 0x0001021b | ||
95 | |||
96 | #define OID_GEN_XMIT_OK 0x00020101 | ||
97 | #define OID_GEN_RCV_OK 0x00020102 | ||
98 | #define OID_GEN_XMIT_ERROR 0x00020103 | ||
99 | #define OID_GEN_RCV_ERROR 0x00020104 | ||
100 | #define OID_GEN_RCV_NO_BUFFER 0x00020105 | ||
101 | |||
102 | #define OID_802_3_CURRENT_ADDRESS 0x01010102 | ||
103 | #define OID_802_3_MULTICAST_LIST 0x01010103 | ||
104 | #define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104 | ||
105 | |||
106 | #define OID_802_11_BSSID 0x0d010101 | ||
107 | #define OID_802_11_SSID 0x0d010102 | ||
108 | #define OID_802_11_INFRASTRUCTURE_MODE 0x0d010108 | ||
109 | #define OID_802_11_ADD_WEP 0x0d010113 | ||
110 | #define OID_802_11_REMOVE_WEP 0x0d010114 | ||
111 | #define OID_802_11_DISASSOCIATE 0x0d010115 | ||
112 | #define OID_802_11_AUTHENTICATION_MODE 0x0d010118 | ||
113 | #define OID_802_11_PRIVACY_FILTER 0x0d010119 | ||
114 | #define OID_802_11_BSSID_LIST_SCAN 0x0d01011a | ||
115 | #define OID_802_11_ENCRYPTION_STATUS 0x0d01011b | ||
116 | #define OID_802_11_ADD_KEY 0x0d01011d | ||
117 | #define OID_802_11_REMOVE_KEY 0x0d01011e | ||
118 | #define OID_802_11_ASSOCIATION_INFORMATION 0x0d01011f | ||
119 | #define OID_802_11_CAPABILITY 0x0d010122 | ||
120 | #define OID_802_11_PMKID 0x0d010123 | ||
121 | #define OID_802_11_NETWORK_TYPES_SUPPORTED 0x0d010203 | ||
122 | #define OID_802_11_NETWORK_TYPE_IN_USE 0x0d010204 | ||
123 | #define OID_802_11_TX_POWER_LEVEL 0x0d010205 | ||
124 | #define OID_802_11_RSSI 0x0d010206 | ||
125 | #define OID_802_11_RSSI_TRIGGER 0x0d010207 | ||
126 | #define OID_802_11_FRAGMENTATION_THRESHOLD 0x0d010209 | ||
127 | #define OID_802_11_RTS_THRESHOLD 0x0d01020a | ||
128 | #define OID_802_11_SUPPORTED_RATES 0x0d01020e | ||
129 | #define OID_802_11_CONFIGURATION 0x0d010211 | ||
130 | #define OID_802_11_POWER_MODE 0x0d010216 | ||
131 | #define OID_802_11_BSSID_LIST 0x0d010217 | ||
132 | |||
133 | |||
134 | /* Typical noise/maximum signal level values taken from ndiswrapper iw_ndis.h */ | 91 | /* Typical noise/maximum signal level values taken from ndiswrapper iw_ndis.h */ |
135 | #define WL_NOISE -96 /* typical noise level in dBm */ | 92 | #define WL_NOISE -96 /* typical noise level in dBm */ |
136 | #define WL_SIGMAX -32 /* typical maximum signal level in dBm */ | 93 | #define WL_SIGMAX -32 /* typical maximum signal level in dBm */ |
@@ -149,12 +106,6 @@ MODULE_PARM_DESC(workaround_interval, | |||
149 | #define BCM4320_DEFAULT_TXPOWER_DBM_50 10 | 106 | #define BCM4320_DEFAULT_TXPOWER_DBM_50 10 |
150 | #define BCM4320_DEFAULT_TXPOWER_DBM_25 7 | 107 | #define BCM4320_DEFAULT_TXPOWER_DBM_25 7 |
151 | 108 | ||
152 | |||
153 | /* codes for "status" field of completion messages */ | ||
154 | #define RNDIS_STATUS_ADAPTER_NOT_READY 0xc0010011 | ||
155 | #define RNDIS_STATUS_ADAPTER_NOT_OPEN 0xc0010012 | ||
156 | |||
157 | |||
158 | /* Known device types */ | 109 | /* Known device types */ |
159 | #define RNDIS_UNKNOWN 0 | 110 | #define RNDIS_UNKNOWN 0 |
160 | #define RNDIS_BCM4320A 1 | 111 | #define RNDIS_BCM4320A 1 |