diff options
author | Marc Yang <yangyang@marvell.com> | 2011-03-28 20:55:44 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-04 16:20:05 -0400 |
commit | 4f3f1ee9f373abfdc09bb3bed87969b7fe0fba06 (patch) | |
tree | 7a66e5cd1547f80f034a97aa049ef1e8b845e159 | |
parent | fd2e401a35500c9af63dc7ffbc545d2e3c478702 (diff) |
mwifiex: remove unused macros in fw.h
These definitions are no longer used after previous cleanups.
Signed-off-by: Marc Yang <yangyang@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/mwifiex/fw.h | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h index 2d9339145e08..b4e4991e58e8 100644 --- a/drivers/net/wireless/mwifiex/fw.h +++ b/drivers/net/wireless/mwifiex/fw.h | |||
@@ -107,8 +107,6 @@ enum KEY_INFO_WAPI { | |||
107 | 107 | ||
108 | #define FIRMWARE_READY 0xfedc | 108 | #define FIRMWARE_READY 0xfedc |
109 | 109 | ||
110 | #define FIRMWARE_TRANSFER_NBLOCK 2 | ||
111 | |||
112 | enum MWIFIEX_802_11_PRIVACY_FILTER { | 110 | enum MWIFIEX_802_11_PRIVACY_FILTER { |
113 | MWIFIEX_802_11_PRIV_FILTER_ACCEPT_ALL, | 111 | MWIFIEX_802_11_PRIV_FILTER_ACCEPT_ALL, |
114 | MWIFIEX_802_11_PRIV_FILTER_8021X_WEP | 112 | MWIFIEX_802_11_PRIV_FILTER_8021X_WEP |
@@ -125,50 +123,22 @@ enum MWIFIEX_802_11_WEP_STATUS { | |||
125 | #define TLV_TYPE_KEY_MATERIAL (PROPRIETARY_TLV_BASE_ID + 0) | 123 | #define TLV_TYPE_KEY_MATERIAL (PROPRIETARY_TLV_BASE_ID + 0) |
126 | #define TLV_TYPE_CHANLIST (PROPRIETARY_TLV_BASE_ID + 1) | 124 | #define TLV_TYPE_CHANLIST (PROPRIETARY_TLV_BASE_ID + 1) |
127 | #define TLV_TYPE_NUMPROBES (PROPRIETARY_TLV_BASE_ID + 2) | 125 | #define TLV_TYPE_NUMPROBES (PROPRIETARY_TLV_BASE_ID + 2) |
128 | #define TLV_TYPE_RSSI_LOW (PROPRIETARY_TLV_BASE_ID + 4) | ||
129 | #define TLV_TYPE_SNR_LOW (PROPRIETARY_TLV_BASE_ID + 5) | ||
130 | #define TLV_TYPE_FAILCOUNT (PROPRIETARY_TLV_BASE_ID + 6) | ||
131 | #define TLV_TYPE_BCNMISS (PROPRIETARY_TLV_BASE_ID + 7) | ||
132 | #define TLV_TYPE_LEDBEHAVIOR (PROPRIETARY_TLV_BASE_ID + 9) | ||
133 | #define TLV_TYPE_PASSTHROUGH (PROPRIETARY_TLV_BASE_ID + 10) | 126 | #define TLV_TYPE_PASSTHROUGH (PROPRIETARY_TLV_BASE_ID + 10) |
134 | #define TLV_TYPE_POWER_TBL_2_4GHZ (PROPRIETARY_TLV_BASE_ID + 12) | ||
135 | #define TLV_TYPE_POWER_TBL_5GHZ (PROPRIETARY_TLV_BASE_ID + 13) | ||
136 | #define TLV_TYPE_WMMQSTATUS (PROPRIETARY_TLV_BASE_ID + 16) | 127 | #define TLV_TYPE_WMMQSTATUS (PROPRIETARY_TLV_BASE_ID + 16) |
137 | #define TLV_TYPE_WILDCARDSSID (PROPRIETARY_TLV_BASE_ID + 18) | 128 | #define TLV_TYPE_WILDCARDSSID (PROPRIETARY_TLV_BASE_ID + 18) |
138 | #define TLV_TYPE_TSFTIMESTAMP (PROPRIETARY_TLV_BASE_ID + 19) | 129 | #define TLV_TYPE_TSFTIMESTAMP (PROPRIETARY_TLV_BASE_ID + 19) |
139 | #define TLV_TYPE_RSSI_HIGH (PROPRIETARY_TLV_BASE_ID + 22) | ||
140 | #define TLV_TYPE_SNR_HIGH (PROPRIETARY_TLV_BASE_ID + 23) | ||
141 | 130 | ||
142 | #define TLV_TYPE_STARTBGSCANLATER (PROPRIETARY_TLV_BASE_ID + 30) | ||
143 | #define TLV_TYPE_AUTH_TYPE (PROPRIETARY_TLV_BASE_ID + 31) | 131 | #define TLV_TYPE_AUTH_TYPE (PROPRIETARY_TLV_BASE_ID + 31) |
144 | #define TLV_TYPE_LINK_QUALITY (PROPRIETARY_TLV_BASE_ID + 36) | ||
145 | #define TLV_TYPE_RSSI_LOW_DATA (PROPRIETARY_TLV_BASE_ID + 38) | ||
146 | #define TLV_TYPE_SNR_LOW_DATA (PROPRIETARY_TLV_BASE_ID + 39) | ||
147 | #define TLV_TYPE_RSSI_HIGH_DATA (PROPRIETARY_TLV_BASE_ID + 40) | ||
148 | #define TLV_TYPE_SNR_HIGH_DATA (PROPRIETARY_TLV_BASE_ID + 41) | ||
149 | 132 | ||
150 | #define TLV_TYPE_CHANNELBANDLIST (PROPRIETARY_TLV_BASE_ID + 42) | 133 | #define TLV_TYPE_CHANNELBANDLIST (PROPRIETARY_TLV_BASE_ID + 42) |
151 | #define TLV_TYPE_WAPI_IE (PROPRIETARY_TLV_BASE_ID + 94) | 134 | #define TLV_TYPE_WAPI_IE (PROPRIETARY_TLV_BASE_ID + 94) |
152 | #define TLV_TYPE_BSSID (PROPRIETARY_TLV_BASE_ID + 35) | ||
153 | 135 | ||
154 | #define MWIFIEX_TX_DATA_BUF_SIZE_2K 2048 | 136 | #define MWIFIEX_TX_DATA_BUF_SIZE_2K 2048 |
155 | 137 | ||
156 | #define TLV_TYPE_HT_CAP (PROPRIETARY_TLV_BASE_ID + 74) | ||
157 | #define TLV_TYPE_HT_INFO (PROPRIETARY_TLV_BASE_ID + 75) | ||
158 | #define TLV_SECONDARY_CHANNEL_OFFSET (PROPRIETARY_TLV_BASE_ID + 76) | ||
159 | #define TLV_TYPE_2040BSS_COEXISTENCE (PROPRIETARY_TLV_BASE_ID + 77) | ||
160 | #define TLV_TYPE_OVERLAP_BSS_SCAN_PARAM (PROPRIETARY_TLV_BASE_ID + 78) | ||
161 | #define TLV_TYPE_EXTCAP (PROPRIETARY_TLV_BASE_ID + 79) | ||
162 | #define TLV_TYPE_HT_OPERATIONAL_MCS_SET (PROPRIETARY_TLV_BASE_ID + 80) | ||
163 | |||
164 | #define ADDBA_TID_MASK (BIT(2) | BIT(3) | BIT(4) | BIT(5)) | ||
165 | #define DELBA_TID_MASK (BIT(12) | BIT(13) | BIT(14) | BIT(15)) | ||
166 | #define SSN_MASK 0xfff0 | 138 | #define SSN_MASK 0xfff0 |
167 | 139 | ||
168 | #define BA_RESULT_SUCCESS 0x0 | 140 | #define BA_RESULT_SUCCESS 0x0 |
169 | #define BA_RESULT_FAILURE 0x1 | ||
170 | #define BA_RESULT_TIMEOUT 0x2 | 141 | #define BA_RESULT_TIMEOUT 0x2 |
171 | #define BA_RESULT_DATA_INVALID 0x3 | ||
172 | 142 | ||
173 | #define IS_BASTREAM_SETUP(ptr) (ptr->ba_status) | 143 | #define IS_BASTREAM_SETUP(ptr) (ptr->ba_status) |
174 | 144 | ||
@@ -214,7 +184,6 @@ enum MWIFIEX_802_11_WEP_STATUS { | |||
214 | 184 | ||
215 | #define LLC_SNAP_LEN 8 | 185 | #define LLC_SNAP_LEN 8 |
216 | 186 | ||
217 | #define TLV_TYPE_RATE_DROP_PATTERN (PROPRIETARY_TLV_BASE_ID + 81) | ||
218 | #define TLV_TYPE_RATE_DROP_CONTROL (PROPRIETARY_TLV_BASE_ID + 82) | 187 | #define TLV_TYPE_RATE_DROP_CONTROL (PROPRIETARY_TLV_BASE_ID + 82) |
219 | #define TLV_TYPE_RATE_SCOPE (PROPRIETARY_TLV_BASE_ID + 83) | 188 | #define TLV_TYPE_RATE_SCOPE (PROPRIETARY_TLV_BASE_ID + 83) |
220 | 189 | ||
@@ -282,15 +251,7 @@ enum ENH_PS_MODES { | |||
282 | #define HostCmd_RET_BIT 0x8000 | 251 | #define HostCmd_RET_BIT 0x8000 |
283 | #define HostCmd_ACT_GEN_GET 0x0000 | 252 | #define HostCmd_ACT_GEN_GET 0x0000 |
284 | #define HostCmd_ACT_GEN_SET 0x0001 | 253 | #define HostCmd_ACT_GEN_SET 0x0001 |
285 | #define HostCmd_ACT_GEN_REMOVE 0x0004 | ||
286 | #define HostCmd_ACT_SET_BOTH 0x0003 | ||
287 | #define HostCmd_ACT_GET_BOTH 0x000c | ||
288 | #define HostCmd_RESULT_OK 0x0000 | 254 | #define HostCmd_RESULT_OK 0x0000 |
289 | #define HostCmd_RESULT_ERROR 0x0001 | ||
290 | #define HostCmd_RESULT_NOT_SUPPORT 0x0002 | ||
291 | #define HostCmd_RESULT_PENDING 0x0003 | ||
292 | #define HostCmd_RESULT_BUSY 0x0004 | ||
293 | #define HostCmd_RESULT_PARTIAL_DATA 0x0005 | ||
294 | 255 | ||
295 | #define HostCmd_ACT_MAC_RX_ON 0x0001 | 256 | #define HostCmd_ACT_MAC_RX_ON 0x0001 |
296 | #define HostCmd_ACT_MAC_TX_ON 0x0002 | 257 | #define HostCmd_ACT_MAC_TX_ON 0x0002 |
@@ -298,11 +259,8 @@ enum ENH_PS_MODES { | |||
298 | #define HostCmd_ACT_MAC_ETHERNETII_ENABLE 0x0010 | 259 | #define HostCmd_ACT_MAC_ETHERNETII_ENABLE 0x0010 |
299 | #define HostCmd_ACT_MAC_PROMISCUOUS_ENABLE 0x0080 | 260 | #define HostCmd_ACT_MAC_PROMISCUOUS_ENABLE 0x0080 |
300 | #define HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE 0x0100 | 261 | #define HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE 0x0100 |
301 | #define HostCmd_ACT_MAC_RTS_CTS_ENABLE 0x0200 | ||
302 | #define HostCmd_ACT_MAC_STRICT_PROTECTION_ENABLE 0x0400 | ||
303 | #define HostCmd_ACT_MAC_ADHOC_G_PROTECTION_ON 0x2000 | 262 | #define HostCmd_ACT_MAC_ADHOC_G_PROTECTION_ON 0x2000 |
304 | 263 | ||
305 | #define HostCmd_BSS_MODE_BSS 0x0001 | ||
306 | #define HostCmd_BSS_MODE_IBSS 0x0002 | 264 | #define HostCmd_BSS_MODE_IBSS 0x0002 |
307 | #define HostCmd_BSS_MODE_ANY 0x0003 | 265 | #define HostCmd_BSS_MODE_ANY 0x0003 |
308 | 266 | ||