diff options
| author | Luciano Coelho <coelho@ti.com> | 2011-05-02 12:37:33 +0300 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-05-02 12:46:40 +0300 |
| commit | 25eaea30cd7b009ba2ca693708330d2f395cbc4d (patch) | |
| tree | 1bdd81bf897ce181e644c380bfaed9a4e205849a /drivers/net/wireless/wl12xx/conf.h | |
| parent | 2d66bee7fbd38d28e9ed12f45b8e9db8e6aa0c49 (diff) | |
| download | kernel_samsung_smdk4412-25eaea30cd7b009ba2ca693708330d2f395cbc4d.zip kernel_samsung_smdk4412-25eaea30cd7b009ba2ca693708330d2f395cbc4d.tar.gz kernel_samsung_smdk4412-25eaea30cd7b009ba2ca693708330d2f395cbc4d.tar.bz2 | |
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/conf.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/conf.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h index c0045f0..1f94736 100644 --- a/drivers/net/wireless/wl12xx/conf.h +++ b/drivers/net/wireless/wl12xx/conf.h @@ -711,18 +711,10 @@ struct conf_tx_settings { struct conf_tx_ac_category ac_conf[CONF_TX_MAX_AC_COUNT]; /* - * Allow this number of TX retries to a connected station/AP before an + * AP-mode - allow this number of TX retries to a station before an * event is triggered from FW. - * In AP-mode the hlids of unreachable stations are given in the - * "sta_tx_retry_exceeded" member in the event mailbox. */ - u8 max_tx_retries; - - /* - * AP-mode - after this number of seconds a connected station is - * considered inactive. - */ - u16 ap_aging_period; + u16 ap_max_tx_retries; /* * Configuration for TID parameters. |