diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-22 15:10:22 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-22 15:10:22 -0500 |
| commit | 5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce (patch) | |
| tree | b5e5787a6d5c15e589d275c7434ebbf341257234 /drivers/net/wireless/wl12xx/init.c | |
| parent | db62983a1e4b2af9e79c97af768f0c8b80bd93f0 (diff) | |
| parent | 320d6c1b56de5f461c6062625b9664095f90ee95 (diff) | |
| download | linux-5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce.tar.gz linux-5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce.tar.bz2 linux-5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/wl12xx/init.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/init.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c index 70b3dc88a219..62dc9839dd31 100644 --- a/drivers/net/wireless/wl12xx/init.c +++ b/drivers/net/wireless/wl12xx/init.c @@ -325,6 +325,11 @@ static int wl1271_sta_hw_init(struct wl1271 *wl) if (ret < 0) return ret; + /* PS config */ + ret = wl1271_acx_config_ps(wl); + if (ret < 0) + return ret; + ret = wl1271_sta_init_templates_config(wl); if (ret < 0) return ret; @@ -367,6 +372,10 @@ static int wl1271_sta_hw_init(struct wl1271 *wl) if (ret < 0) return ret; + ret = wl1271_acx_sta_mem_cfg(wl); + if (ret < 0) + return ret; + return 0; } @@ -433,6 +442,10 @@ static int wl1271_ap_hw_init(struct wl1271 *wl) if (ret < 0) return ret; + ret = wl1271_acx_ap_mem_cfg(wl); + if (ret < 0) + return ret; + return 0; } |