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/init.c | |
| 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/init.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/init.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c index b1242a6de27b..a8f4f156c055 100644 --- a/drivers/net/wireless/wl12xx/init.c +++ b/drivers/net/wireless/wl12xx/init.c @@ -378,10 +378,6 @@ static int wl1271_sta_hw_init(struct wl1271 *wl) if (ret < 0) return ret; - ret = wl1271_acx_sta_max_tx_retry(wl); - if (ret < 0) - return ret; - ret = wl1271_acx_sta_mem_cfg(wl); if (ret < 0) return ret; @@ -432,7 +428,7 @@ static int wl1271_ap_hw_init(struct wl1271 *wl) if (ret < 0) return ret; - ret = wl1271_acx_ap_max_tx_retry(wl); + ret = wl1271_acx_max_tx_retry(wl); if (ret < 0) return ret; |