aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1251.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251.h')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251.h b/drivers/net/wireless/wl12xx/wl1251.h
index 998e4b6252bd..37c61c19cae5 100644
--- a/drivers/net/wireless/wl12xx/wl1251.h
+++ b/drivers/net/wireless/wl12xx/wl1251.h
@@ -247,6 +247,7 @@ struct wl1251_debugfs {
247 struct dentry *rxpipe_tx_xfr_host_int_trig_rx_data; 247 struct dentry *rxpipe_tx_xfr_host_int_trig_rx_data;
248 248
249 struct dentry *tx_queue_len; 249 struct dentry *tx_queue_len;
250 struct dentry *tx_queue_status;
250 251
251 struct dentry *retry_count; 252 struct dentry *retry_count;
252 struct dentry *excessive_retries; 253 struct dentry *excessive_retries;
@@ -269,6 +270,7 @@ struct wl1251 {
269 270
270 void (*set_power)(bool enable); 271 void (*set_power)(bool enable);
271 int irq; 272 int irq;
273 bool use_eeprom;
272 274
273 enum wl1251_state state; 275 enum wl1251_state state;
274 struct mutex mutex; 276 struct mutex mutex;
@@ -339,9 +341,6 @@ struct wl1251 {
339 /* Are we currently scanning */ 341 /* Are we currently scanning */
340 bool scanning; 342 bool scanning;
341 343
342 /* Our association ID */
343 u16 aid;
344
345 /* Default key (for WEP) */ 344 /* Default key (for WEP) */
346 u32 default_key; 345 u32 default_key;
347 346
@@ -354,6 +353,8 @@ struct wl1251 {
354 /* is firmware in elp mode */ 353 /* is firmware in elp mode */
355 bool elp; 354 bool elp;
356 355
356 struct delayed_work elp_work;
357
357 /* we can be in psm, but not in elp, we have to differentiate */ 358 /* we can be in psm, but not in elp, we have to differentiate */
358 bool psm; 359 bool psm;
359 360
@@ -374,6 +375,8 @@ struct wl1251 {
374 u8 buffer_busyword[WL1251_BUSY_WORD_LEN]; 375 u8 buffer_busyword[WL1251_BUSY_WORD_LEN];
375 struct wl1251_rx_descriptor *rx_descriptor; 376 struct wl1251_rx_descriptor *rx_descriptor;
376 377
378 struct ieee80211_vif *vif;
379
377 u32 chip_id; 380 u32 chip_id;
378 char fw_ver[21]; 381 char fw_ver[21];
379}; 382};