diff options
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/commands.h')
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/commands.h | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/commands.h b/drivers/net/wireless/iwmc3200wifi/commands.h index 7e16bcf5997..6421689f5e8 100644 --- a/drivers/net/wireless/iwmc3200wifi/commands.h +++ b/drivers/net/wireless/iwmc3200wifi/commands.h | |||
@@ -56,7 +56,7 @@ | |||
56 | 56 | ||
57 | struct iwm_umac_cmd_reset { | 57 | struct iwm_umac_cmd_reset { |
58 | __le32 flags; | 58 | __le32 flags; |
59 | } __attribute__ ((packed)); | 59 | } __packed; |
60 | 60 | ||
61 | #define UMAC_PARAM_TBL_ORD_FIX 0x0 | 61 | #define UMAC_PARAM_TBL_ORD_FIX 0x0 |
62 | #define UMAC_PARAM_TBL_ORD_VAR 0x1 | 62 | #define UMAC_PARAM_TBL_ORD_VAR 0x1 |
@@ -220,37 +220,37 @@ struct iwm_umac_cmd_set_param_fix { | |||
220 | __le16 tbl; | 220 | __le16 tbl; |
221 | __le16 key; | 221 | __le16 key; |
222 | __le32 value; | 222 | __le32 value; |
223 | } __attribute__ ((packed)); | 223 | } __packed; |
224 | 224 | ||
225 | struct iwm_umac_cmd_set_param_var { | 225 | struct iwm_umac_cmd_set_param_var { |
226 | __le16 tbl; | 226 | __le16 tbl; |
227 | __le16 key; | 227 | __le16 key; |
228 | __le16 len; | 228 | __le16 len; |
229 | __le16 reserved; | 229 | __le16 reserved; |
230 | } __attribute__ ((packed)); | 230 | } __packed; |
231 | 231 | ||
232 | struct iwm_umac_cmd_get_param { | 232 | struct iwm_umac_cmd_get_param { |
233 | __le16 tbl; | 233 | __le16 tbl; |
234 | __le16 key; | 234 | __le16 key; |
235 | } __attribute__ ((packed)); | 235 | } __packed; |
236 | 236 | ||
237 | struct iwm_umac_cmd_get_param_resp { | 237 | struct iwm_umac_cmd_get_param_resp { |
238 | __le16 tbl; | 238 | __le16 tbl; |
239 | __le16 key; | 239 | __le16 key; |
240 | __le16 len; | 240 | __le16 len; |
241 | __le16 reserved; | 241 | __le16 reserved; |
242 | } __attribute__ ((packed)); | 242 | } __packed; |
243 | 243 | ||
244 | struct iwm_umac_cmd_eeprom_proxy_hdr { | 244 | struct iwm_umac_cmd_eeprom_proxy_hdr { |
245 | __le32 type; | 245 | __le32 type; |
246 | __le32 offset; | 246 | __le32 offset; |
247 | __le32 len; | 247 | __le32 len; |
248 | } __attribute__ ((packed)); | 248 | } __packed; |
249 | 249 | ||
250 | struct iwm_umac_cmd_eeprom_proxy { | 250 | struct iwm_umac_cmd_eeprom_proxy { |
251 | struct iwm_umac_cmd_eeprom_proxy_hdr hdr; | 251 | struct iwm_umac_cmd_eeprom_proxy_hdr hdr; |
252 | u8 buf[0]; | 252 | u8 buf[0]; |
253 | } __attribute__ ((packed)); | 253 | } __packed; |
254 | 254 | ||
255 | #define IWM_UMAC_CMD_EEPROM_TYPE_READ 0x1 | 255 | #define IWM_UMAC_CMD_EEPROM_TYPE_READ 0x1 |
256 | #define IWM_UMAC_CMD_EEPROM_TYPE_WRITE 0x2 | 256 | #define IWM_UMAC_CMD_EEPROM_TYPE_WRITE 0x2 |
@@ -267,13 +267,13 @@ struct iwm_umac_channel_info { | |||
267 | u8 reserved; | 267 | u8 reserved; |
268 | u8 flags; | 268 | u8 flags; |
269 | __le32 channels_mask; | 269 | __le32 channels_mask; |
270 | } __attribute__ ((packed)); | 270 | } __packed; |
271 | 271 | ||
272 | struct iwm_umac_cmd_get_channel_list { | 272 | struct iwm_umac_cmd_get_channel_list { |
273 | __le16 count; | 273 | __le16 count; |
274 | __le16 reserved; | 274 | __le16 reserved; |
275 | struct iwm_umac_channel_info ch[0]; | 275 | struct iwm_umac_channel_info ch[0]; |
276 | } __attribute__ ((packed)); | 276 | } __packed; |
277 | 277 | ||
278 | 278 | ||
279 | /* UMAC WiFi interface commands */ | 279 | /* UMAC WiFi interface commands */ |
@@ -304,7 +304,7 @@ struct iwm_umac_ssid { | |||
304 | u8 ssid_len; | 304 | u8 ssid_len; |
305 | u8 ssid[IEEE80211_MAX_SSID_LEN]; | 305 | u8 ssid[IEEE80211_MAX_SSID_LEN]; |
306 | u8 reserved[3]; | 306 | u8 reserved[3]; |
307 | } __attribute__ ((packed)); | 307 | } __packed; |
308 | 308 | ||
309 | struct iwm_umac_cmd_scan_request { | 309 | struct iwm_umac_cmd_scan_request { |
310 | struct iwm_umac_wifi_if hdr; | 310 | struct iwm_umac_wifi_if hdr; |
@@ -314,7 +314,7 @@ struct iwm_umac_cmd_scan_request { | |||
314 | u8 timeout; /* In seconds */ | 314 | u8 timeout; /* In seconds */ |
315 | u8 reserved; | 315 | u8 reserved; |
316 | struct iwm_umac_ssid ssids[UMAC_WIFI_IF_PROBE_OPTION_MAX]; | 316 | struct iwm_umac_ssid ssids[UMAC_WIFI_IF_PROBE_OPTION_MAX]; |
317 | } __attribute__ ((packed)); | 317 | } __packed; |
318 | 318 | ||
319 | #define UMAC_CIPHER_TYPE_NONE 0xFF | 319 | #define UMAC_CIPHER_TYPE_NONE 0xFF |
320 | #define UMAC_CIPHER_TYPE_USE_GROUPCAST 0x00 | 320 | #define UMAC_CIPHER_TYPE_USE_GROUPCAST 0x00 |
@@ -357,7 +357,7 @@ struct iwm_umac_security { | |||
357 | u8 ucast_cipher; | 357 | u8 ucast_cipher; |
358 | u8 mcast_cipher; | 358 | u8 mcast_cipher; |
359 | u8 flags; | 359 | u8 flags; |
360 | } __attribute__ ((packed)); | 360 | } __packed; |
361 | 361 | ||
362 | struct iwm_umac_ibss { | 362 | struct iwm_umac_ibss { |
363 | u8 beacon_interval; /* in millisecond */ | 363 | u8 beacon_interval; /* in millisecond */ |
@@ -366,7 +366,7 @@ struct iwm_umac_ibss { | |||
366 | u8 band; | 366 | u8 band; |
367 | u8 channel; | 367 | u8 channel; |
368 | u8 reserved[3]; | 368 | u8 reserved[3]; |
369 | } __attribute__ ((packed)); | 369 | } __packed; |
370 | 370 | ||
371 | #define UMAC_MODE_BSS 0 | 371 | #define UMAC_MODE_BSS 0 |
372 | #define UMAC_MODE_IBSS 1 | 372 | #define UMAC_MODE_IBSS 1 |
@@ -385,13 +385,13 @@ struct iwm_umac_profile { | |||
385 | __le16 flags; | 385 | __le16 flags; |
386 | u8 wireless_mode; | 386 | u8 wireless_mode; |
387 | u8 bss_num; | 387 | u8 bss_num; |
388 | } __attribute__ ((packed)); | 388 | } __packed; |
389 | 389 | ||
390 | struct iwm_umac_invalidate_profile { | 390 | struct iwm_umac_invalidate_profile { |
391 | struct iwm_umac_wifi_if hdr; | 391 | struct iwm_umac_wifi_if hdr; |
392 | u8 reason; | 392 | u8 reason; |
393 | u8 reserved[3]; | 393 | u8 reserved[3]; |
394 | } __attribute__ ((packed)); | 394 | } __packed; |
395 | 395 | ||
396 | /* Encryption key commands */ | 396 | /* Encryption key commands */ |
397 | struct iwm_umac_key_wep40 { | 397 | struct iwm_umac_key_wep40 { |
@@ -400,7 +400,7 @@ struct iwm_umac_key_wep40 { | |||
400 | u8 key[WLAN_KEY_LEN_WEP40]; | 400 | u8 key[WLAN_KEY_LEN_WEP40]; |
401 | u8 static_key; | 401 | u8 static_key; |
402 | u8 reserved[2]; | 402 | u8 reserved[2]; |
403 | } __attribute__ ((packed)); | 403 | } __packed; |
404 | 404 | ||
405 | struct iwm_umac_key_wep104 { | 405 | struct iwm_umac_key_wep104 { |
406 | struct iwm_umac_wifi_if hdr; | 406 | struct iwm_umac_wifi_if hdr; |
@@ -408,7 +408,7 @@ struct iwm_umac_key_wep104 { | |||
408 | u8 key[WLAN_KEY_LEN_WEP104]; | 408 | u8 key[WLAN_KEY_LEN_WEP104]; |
409 | u8 static_key; | 409 | u8 static_key; |
410 | u8 reserved[2]; | 410 | u8 reserved[2]; |
411 | } __attribute__ ((packed)); | 411 | } __packed; |
412 | 412 | ||
413 | #define IWM_TKIP_KEY_SIZE 16 | 413 | #define IWM_TKIP_KEY_SIZE 16 |
414 | #define IWM_TKIP_MIC_SIZE 8 | 414 | #define IWM_TKIP_MIC_SIZE 8 |
@@ -420,7 +420,7 @@ struct iwm_umac_key_tkip { | |||
420 | u8 tkip_key[IWM_TKIP_KEY_SIZE]; | 420 | u8 tkip_key[IWM_TKIP_KEY_SIZE]; |
421 | u8 mic_rx_key[IWM_TKIP_MIC_SIZE]; | 421 | u8 mic_rx_key[IWM_TKIP_MIC_SIZE]; |
422 | u8 mic_tx_key[IWM_TKIP_MIC_SIZE]; | 422 | u8 mic_tx_key[IWM_TKIP_MIC_SIZE]; |
423 | } __attribute__ ((packed)); | 423 | } __packed; |
424 | 424 | ||
425 | struct iwm_umac_key_ccmp { | 425 | struct iwm_umac_key_ccmp { |
426 | struct iwm_umac_wifi_if hdr; | 426 | struct iwm_umac_wifi_if hdr; |
@@ -428,27 +428,27 @@ struct iwm_umac_key_ccmp { | |||
428 | u8 iv_count[6]; | 428 | u8 iv_count[6]; |
429 | u8 reserved[2]; | 429 | u8 reserved[2]; |
430 | u8 key[WLAN_KEY_LEN_CCMP]; | 430 | u8 key[WLAN_KEY_LEN_CCMP]; |
431 | } __attribute__ ((packed)); | 431 | } __packed; |
432 | 432 | ||
433 | struct iwm_umac_key_remove { | 433 | struct iwm_umac_key_remove { |
434 | struct iwm_umac_wifi_if hdr; | 434 | struct iwm_umac_wifi_if hdr; |
435 | struct iwm_umac_key_hdr key_hdr; | 435 | struct iwm_umac_key_hdr key_hdr; |
436 | } __attribute__ ((packed)); | 436 | } __packed; |
437 | 437 | ||
438 | struct iwm_umac_tx_key_id { | 438 | struct iwm_umac_tx_key_id { |
439 | struct iwm_umac_wifi_if hdr; | 439 | struct iwm_umac_wifi_if hdr; |
440 | u8 key_idx; | 440 | u8 key_idx; |
441 | u8 reserved[3]; | 441 | u8 reserved[3]; |
442 | } __attribute__ ((packed)); | 442 | } __packed; |
443 | 443 | ||
444 | struct iwm_umac_pwr_trigger { | 444 | struct iwm_umac_pwr_trigger { |
445 | struct iwm_umac_wifi_if hdr; | 445 | struct iwm_umac_wifi_if hdr; |
446 | __le32 reseved; | 446 | __le32 reseved; |
447 | } __attribute__ ((packed)); | 447 | } __packed; |
448 | 448 | ||
449 | struct iwm_umac_cmd_stats_req { | 449 | struct iwm_umac_cmd_stats_req { |
450 | __le32 flags; | 450 | __le32 flags; |
451 | } __attribute__ ((packed)); | 451 | } __packed; |
452 | 452 | ||
453 | struct iwm_umac_cmd_stop_resume_tx { | 453 | struct iwm_umac_cmd_stop_resume_tx { |
454 | u8 flags; | 454 | u8 flags; |
@@ -456,7 +456,7 @@ struct iwm_umac_cmd_stop_resume_tx { | |||
456 | __le16 stop_resume_tid_msk; | 456 | __le16 stop_resume_tid_msk; |
457 | __le16 last_seq_num[IWM_UMAC_TID_NR]; | 457 | __le16 last_seq_num[IWM_UMAC_TID_NR]; |
458 | u16 reserved; | 458 | u16 reserved; |
459 | } __attribute__ ((packed)); | 459 | } __packed; |
460 | 460 | ||
461 | #define IWM_CMD_PMKID_ADD 1 | 461 | #define IWM_CMD_PMKID_ADD 1 |
462 | #define IWM_CMD_PMKID_DEL 2 | 462 | #define IWM_CMD_PMKID_DEL 2 |
@@ -468,7 +468,7 @@ struct iwm_umac_pmkid_update { | |||
468 | u8 bssid[ETH_ALEN]; | 468 | u8 bssid[ETH_ALEN]; |
469 | __le16 reserved; | 469 | __le16 reserved; |
470 | u8 pmkid[WLAN_PMKID_LEN]; | 470 | u8 pmkid[WLAN_PMKID_LEN]; |
471 | } __attribute__ ((packed)); | 471 | } __packed; |
472 | 472 | ||
473 | /* LMAC commands */ | 473 | /* LMAC commands */ |
474 | int iwm_read_mac(struct iwm_priv *iwm, u8 *mac); | 474 | int iwm_read_mac(struct iwm_priv *iwm, u8 *mac); |