diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271.h')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271.h | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h index 9af14646c278..ec09f0d40ca2 100644 --- a/drivers/net/wireless/wl12xx/wl1271.h +++ b/drivers/net/wireless/wl12xx/wl1271.h | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <net/mac80211.h> | 33 | #include <net/mac80211.h> |
34 | 34 | ||
35 | #include "wl1271_conf.h" | 35 | #include "wl1271_conf.h" |
36 | #include "wl1271_ini.h" | ||
36 | 37 | ||
37 | #define DRIVER_NAME "wl1271" | 38 | #define DRIVER_NAME "wl1271" |
38 | #define DRIVER_PREFIX DRIVER_NAME ": " | 39 | #define DRIVER_PREFIX DRIVER_NAME ": " |
@@ -116,33 +117,6 @@ enum { | |||
116 | #define WL1271_TX_SECURITY_LO16(s) ((u16)((s) & 0xffff)) | 117 | #define WL1271_TX_SECURITY_LO16(s) ((u16)((s) & 0xffff)) |
117 | #define WL1271_TX_SECURITY_HI32(s) ((u32)(((s) >> 16) & 0xffffffff)) | 118 | #define WL1271_TX_SECURITY_HI32(s) ((u32)(((s) >> 16) & 0xffffffff)) |
118 | 119 | ||
119 | /* NVS data structure */ | ||
120 | #define WL1271_NVS_SECTION_SIZE 468 | ||
121 | |||
122 | #define WL1271_NVS_GENERAL_PARAMS_SIZE 57 | ||
123 | #define WL1271_NVS_GENERAL_PARAMS_SIZE_PADDED \ | ||
124 | (WL1271_NVS_GENERAL_PARAMS_SIZE + 1) | ||
125 | #define WL1271_NVS_STAT_RADIO_PARAMS_SIZE 17 | ||
126 | #define WL1271_NVS_STAT_RADIO_PARAMS_SIZE_PADDED \ | ||
127 | (WL1271_NVS_STAT_RADIO_PARAMS_SIZE + 1) | ||
128 | #define WL1271_NVS_DYN_RADIO_PARAMS_SIZE 65 | ||
129 | #define WL1271_NVS_DYN_RADIO_PARAMS_SIZE_PADDED \ | ||
130 | (WL1271_NVS_DYN_RADIO_PARAMS_SIZE + 1) | ||
131 | #define WL1271_NVS_FEM_COUNT 2 | ||
132 | #define WL1271_NVS_INI_SPARE_SIZE 124 | ||
133 | |||
134 | struct wl1271_nvs_file { | ||
135 | /* NVS section */ | ||
136 | u8 nvs[WL1271_NVS_SECTION_SIZE]; | ||
137 | |||
138 | /* INI section */ | ||
139 | u8 general_params[WL1271_NVS_GENERAL_PARAMS_SIZE_PADDED]; | ||
140 | u8 stat_radio_params[WL1271_NVS_STAT_RADIO_PARAMS_SIZE_PADDED]; | ||
141 | u8 dyn_radio_params[WL1271_NVS_FEM_COUNT] | ||
142 | [WL1271_NVS_DYN_RADIO_PARAMS_SIZE_PADDED]; | ||
143 | u8 ini_spare[WL1271_NVS_INI_SPARE_SIZE]; | ||
144 | } __packed; | ||
145 | |||
146 | /* | 120 | /* |
147 | * Enable/disable 802.11a support for WL1273 | 121 | * Enable/disable 802.11a support for WL1273 |
148 | */ | 122 | */ |
@@ -325,6 +299,7 @@ struct wl1271_rx_mem_pool_addr { | |||
325 | }; | 299 | }; |
326 | 300 | ||
327 | struct wl1271_scan { | 301 | struct wl1271_scan { |
302 | struct cfg80211_scan_request *req; | ||
328 | u8 state; | 303 | u8 state; |
329 | u8 ssid[IW_ESSID_MAX_SIZE+1]; | 304 | u8 ssid[IW_ESSID_MAX_SIZE+1]; |
330 | size_t ssid_len; | 305 | size_t ssid_len; |
@@ -375,6 +350,7 @@ struct wl1271 { | |||
375 | #define WL1271_FLAG_IRQ_PENDING (9) | 350 | #define WL1271_FLAG_IRQ_PENDING (9) |
376 | #define WL1271_FLAG_IRQ_RUNNING (10) | 351 | #define WL1271_FLAG_IRQ_RUNNING (10) |
377 | #define WL1271_FLAG_IDLE (11) | 352 | #define WL1271_FLAG_IDLE (11) |
353 | #define WL1271_FLAG_IDLE_REQUESTED (12) | ||
378 | unsigned long flags; | 354 | unsigned long flags; |
379 | 355 | ||
380 | struct wl1271_partition_set part; | 356 | struct wl1271_partition_set part; |
@@ -421,6 +397,7 @@ struct wl1271 { | |||
421 | 397 | ||
422 | /* Pending TX frames */ | 398 | /* Pending TX frames */ |
423 | struct sk_buff *tx_frames[ACX_TX_DESCRIPTORS]; | 399 | struct sk_buff *tx_frames[ACX_TX_DESCRIPTORS]; |
400 | int tx_frames_cnt; | ||
424 | 401 | ||
425 | /* Security sequence number counters */ | 402 | /* Security sequence number counters */ |
426 | u8 tx_security_last_seq; | 403 | u8 tx_security_last_seq; |