lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "wl12xx: support FW TX inactivity triggers"

Browse Source 
This reverts commit 47684808fd.

Conflicts:

	drivers/net/wireless/wl12xx/conf.h
	drivers/net/wireless/wl12xx/main.c
This commit is contained in:
Luciano Coelho
2011-05-02 12:37:33 +03:00
parent 2d66bee7fb
commit 25eaea30cd
10 changed files with 17 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/wl12xx/init.c
View File

@@ -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;