diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index c8d3d97cf48d..4d789e353e3a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -51,12 +51,8 @@ extern struct iwl_cfg iwl4965_agn_cfg; | |||
51 | extern struct iwl_cfg iwl5300_agn_cfg; | 51 | extern struct iwl_cfg iwl5300_agn_cfg; |
52 | extern struct iwl_cfg iwl5100_agn_cfg; | 52 | extern struct iwl_cfg iwl5100_agn_cfg; |
53 | extern struct iwl_cfg iwl5350_agn_cfg; | 53 | extern struct iwl_cfg iwl5350_agn_cfg; |
54 | 54 | extern struct iwl_cfg iwl5100_bg_cfg; | |
55 | /* Change firmware file name, using "-" and incrementing number, | 55 | extern struct iwl_cfg iwl5100_abg_cfg; |
56 | * *only* when uCode interface or architecture changes so that it | ||
57 | * is not compatible with earlier drivers. | ||
58 | * This number will also appear in << 8 position of 1st dword of uCode file */ | ||
59 | #define IWL4965_UCODE_API "-1" | ||
60 | 56 | ||
61 | /* CT-KILL constants */ | 57 | /* CT-KILL constants */ |
62 | #define CT_KILL_THRESHOLD 110 /* in Celsius */ | 58 | #define CT_KILL_THRESHOLD 110 /* in Celsius */ |
@@ -280,7 +276,7 @@ struct iwl_cmd { | |||
280 | struct iwl_cmd_header hdr; /* uCode API */ | 276 | struct iwl_cmd_header hdr; /* uCode API */ |
281 | union { | 277 | union { |
282 | struct iwl_addsta_cmd addsta; | 278 | struct iwl_addsta_cmd addsta; |
283 | struct iwl4965_led_cmd led; | 279 | struct iwl_led_cmd led; |
284 | u32 flags; | 280 | u32 flags; |
285 | u8 val8; | 281 | u8 val8; |
286 | u16 val16; | 282 | u16 val16; |
@@ -288,7 +284,7 @@ struct iwl_cmd { | |||
288 | struct iwl4965_bt_cmd bt; | 284 | struct iwl4965_bt_cmd bt; |
289 | struct iwl4965_rxon_time_cmd rxon_time; | 285 | struct iwl4965_rxon_time_cmd rxon_time; |
290 | struct iwl4965_powertable_cmd powertable; | 286 | struct iwl4965_powertable_cmd powertable; |
291 | struct iwl4965_qosparam_cmd qosparam; | 287 | struct iwl_qosparam_cmd qosparam; |
292 | struct iwl_tx_cmd tx; | 288 | struct iwl_tx_cmd tx; |
293 | struct iwl4965_tx_beacon_cmd tx_beacon; | 289 | struct iwl4965_tx_beacon_cmd tx_beacon; |
294 | struct iwl4965_rxon_assoc_cmd rxon_assoc; | 290 | struct iwl4965_rxon_assoc_cmd rxon_assoc; |
@@ -433,7 +429,7 @@ struct iwl_ht_info { | |||
433 | u8 non_GF_STA_present; | 429 | u8 non_GF_STA_present; |
434 | }; | 430 | }; |
435 | 431 | ||
436 | union iwl4965_qos_capabity { | 432 | union iwl_qos_capabity { |
437 | struct { | 433 | struct { |
438 | u8 edca_count:4; /* bit 0-3 */ | 434 | u8 edca_count:4; /* bit 0-3 */ |
439 | u8 q_ack:1; /* bit 4 */ | 435 | u8 q_ack:1; /* bit 4 */ |
@@ -454,11 +450,11 @@ union iwl4965_qos_capabity { | |||
454 | }; | 450 | }; |
455 | 451 | ||
456 | /* QoS structures */ | 452 | /* QoS structures */ |
457 | struct iwl4965_qos_info { | 453 | struct iwl_qos_info { |
458 | int qos_enable; | 454 | int qos_enable; |
459 | int qos_active; | 455 | int qos_active; |
460 | union iwl4965_qos_capabity qos_cap; | 456 | union iwl_qos_capabity qos_cap; |
461 | struct iwl4965_qosparam_cmd def_qos_parm; | 457 | struct iwl_qosparam_cmd def_qos_parm; |
462 | }; | 458 | }; |
463 | 459 | ||
464 | #define STA_PS_STATUS_WAKE 0 | 460 | #define STA_PS_STATUS_WAKE 0 |
@@ -490,8 +486,6 @@ struct iwl_ucode { | |||
490 | u8 data[0]; /* data in same order as "size" elements */ | 486 | u8 data[0]; /* data in same order as "size" elements */ |
491 | }; | 487 | }; |
492 | 488 | ||
493 | #define IWL_IBSS_MAC_HASH_SIZE 32 | ||
494 | |||
495 | struct iwl4965_ibss_seq { | 489 | struct iwl4965_ibss_seq { |
496 | u8 mac[ETH_ALEN]; | 490 | u8 mac[ETH_ALEN]; |
497 | u16 seq_num; | 491 | u16 seq_num; |
@@ -933,7 +927,7 @@ struct iwl_priv { | |||
933 | #endif | 927 | #endif |
934 | 928 | ||
935 | #ifdef CONFIG_IWLWIFI_LEDS | 929 | #ifdef CONFIG_IWLWIFI_LEDS |
936 | struct iwl4965_led led[IWL_LED_TRG_MAX]; | 930 | struct iwl_led led[IWL_LED_TRG_MAX]; |
937 | unsigned long last_blink_time; | 931 | unsigned long last_blink_time; |
938 | u8 last_blink_rate; | 932 | u8 last_blink_rate; |
939 | u8 allow_blinking; | 933 | u8 allow_blinking; |
@@ -1042,7 +1036,7 @@ struct iwl_priv { | |||
1042 | u16 assoc_capability; | 1036 | u16 assoc_capability; |
1043 | u8 ps_mode; | 1037 | u8 ps_mode; |
1044 | 1038 | ||
1045 | struct iwl4965_qos_info qos_data; | 1039 | struct iwl_qos_info qos_data; |
1046 | 1040 | ||
1047 | struct workqueue_struct *workqueue; | 1041 | struct workqueue_struct *workqueue; |
1048 | 1042 | ||
@@ -1065,7 +1059,6 @@ struct iwl_priv { | |||
1065 | struct delayed_work init_alive_start; | 1059 | struct delayed_work init_alive_start; |
1066 | struct delayed_work alive_start; | 1060 | struct delayed_work alive_start; |
1067 | struct delayed_work scan_check; | 1061 | struct delayed_work scan_check; |
1068 | struct delayed_work post_associate; | ||
1069 | /* TX Power */ | 1062 | /* TX Power */ |
1070 | s8 tx_power_user_lmt; | 1063 | s8 tx_power_user_lmt; |
1071 | s8 tx_power_channel_lmt; | 1064 | s8 tx_power_channel_lmt; |