diff options
| author | Luciano Coelho <coelho@ti.com> | 2011-05-02 05:37:33 -0400 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-05-02 05:46:40 -0400 |
| commit | 25eaea30cd7b009ba2ca693708330d2f395cbc4d (patch) | |
| tree | 1bdd81bf897ce181e644c380bfaed9a4e205849a /drivers/net/wireless/wl12xx/wl12xx.h | |
| parent | 2d66bee7fbd38d28e9ed12f45b8e9db8e6aa0c49 (diff) | |
Revert "wl12xx: support FW TX inactivity triggers"
This reverts commit 47684808fd89d6809c0886e06f8ac324252499d8.
Conflicts:
drivers/net/wireless/wl12xx/conf.h
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl12xx.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl12xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h index f3de96212b96..b7601438ecac 100644 --- a/drivers/net/wireless/wl12xx/wl12xx.h +++ b/drivers/net/wireless/wl12xx/wl12xx.h | |||
| @@ -172,6 +172,7 @@ extern u32 wl12xx_debug_level; | |||
| 172 | #define WL1271_PS_STA_MAX_BLOCKS (2 * 9) | 172 | #define WL1271_PS_STA_MAX_BLOCKS (2 * 9) |
| 173 | 173 | ||
| 174 | #define WL1271_AP_BSS_INDEX 0 | 174 | #define WL1271_AP_BSS_INDEX 0 |
| 175 | #define WL1271_AP_DEF_INACTIV_SEC 300 | ||
| 175 | #define WL1271_AP_DEF_BEACON_EXP 20 | 176 | #define WL1271_AP_DEF_BEACON_EXP 20 |
| 176 | 177 | ||
| 177 | #define ACX_TX_DESCRIPTORS 32 | 178 | #define ACX_TX_DESCRIPTORS 32 |