diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl12xx.h')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl12xx.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h index 90352415e2aa..749a15a75d38 100644 --- a/drivers/net/wireless/wl12xx/wl12xx.h +++ b/drivers/net/wireless/wl12xx/wl12xx.h | |||
@@ -260,11 +260,13 @@ enum wl12xx_flags { | |||
260 | WL1271_FLAG_SOFT_GEMINI, | 260 | WL1271_FLAG_SOFT_GEMINI, |
261 | WL1271_FLAG_RECOVERY_IN_PROGRESS, | 261 | WL1271_FLAG_RECOVERY_IN_PROGRESS, |
262 | WL1271_FLAG_VIF_CHANGE_IN_PROGRESS, | 262 | WL1271_FLAG_VIF_CHANGE_IN_PROGRESS, |
263 | WL1271_FLAG_INTENDED_FW_RECOVERY, | ||
263 | }; | 264 | }; |
264 | 265 | ||
265 | enum wl12xx_vif_flags { | 266 | enum wl12xx_vif_flags { |
266 | WLVIF_FLAG_INITIALIZED, | 267 | WLVIF_FLAG_INITIALIZED, |
267 | WLVIF_FLAG_STA_ASSOCIATED, | 268 | WLVIF_FLAG_STA_ASSOCIATED, |
269 | WLVIF_FLAG_STA_AUTHORIZED, | ||
268 | WLVIF_FLAG_IBSS_JOINED, | 270 | WLVIF_FLAG_IBSS_JOINED, |
269 | WLVIF_FLAG_AP_STARTED, | 271 | WLVIF_FLAG_AP_STARTED, |
270 | WLVIF_FLAG_IN_PS, | 272 | WLVIF_FLAG_IN_PS, |
@@ -452,8 +454,6 @@ struct wl1271 { | |||
452 | 454 | ||
453 | bool enable_11a; | 455 | bool enable_11a; |
454 | 456 | ||
455 | struct list_head list; | ||
456 | |||
457 | /* Most recently reported noise in dBm */ | 457 | /* Most recently reported noise in dBm */ |
458 | s8 noise; | 458 | s8 noise; |
459 | 459 | ||
@@ -495,6 +495,9 @@ struct wl1271 { | |||
495 | 495 | ||
496 | /* last wlvif we transmitted from */ | 496 | /* last wlvif we transmitted from */ |
497 | struct wl12xx_vif *last_wlvif; | 497 | struct wl12xx_vif *last_wlvif; |
498 | |||
499 | /* work to fire when Tx is stuck */ | ||
500 | struct delayed_work tx_watchdog_work; | ||
498 | }; | 501 | }; |
499 | 502 | ||
500 | struct wl1271_station { | 503 | struct wl1271_station { |