diff options
| author | Arik Nemtsov <arik@wizery.com> | 2011-04-18 14:15:20 +0300 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-05-02 10:28:49 +0300 |
| commit | 801f870bc0524bad7ebef9cea52d20e4d4992e4a (patch) | |
| tree | b83962d14cbc250cb6e036fd5d296118c8f605ab /drivers/net/wireless/wl12xx/init.c | |
| parent | f7c7c7e69cbc3c5b660a32cc2cb31720b2b420c8 (diff) | |
| download | kernel_samsung_smdk4412-801f870bc0524bad7ebef9cea52d20e4d4992e4a.zip kernel_samsung_smdk4412-801f870bc0524bad7ebef9cea52d20e4d4992e4a.tar.gz kernel_samsung_smdk4412-801f870bc0524bad7ebef9cea52d20e4d4992e4a.tar.bz2 | |
wl12xx: add BT-coexistance for AP
Initialize AP specific BT coexitance parameters to default values and
enable them in AP mode.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/init.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/init.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c index 46fd721..1be6569 100644 --- a/drivers/net/wireless/wl12xx/init.c +++ b/drivers/net/wireless/wl12xx/init.c @@ -285,7 +285,10 @@ int wl1271_init_pta(struct wl1271 *wl) { int ret; - ret = wl1271_acx_sg_cfg(wl); + if (wl->bss_type == BSS_TYPE_AP_BSS) + ret = wl1271_acx_ap_sg_cfg(wl); + else + ret = wl1271_acx_sta_sg_cfg(wl); if (ret < 0) return ret; @@ -351,11 +354,6 @@ static int wl1271_sta_hw_init(struct wl1271 *wl) if (ret < 0) return ret; - /* Bluetooth WLAN coexistence */ - ret = wl1271_init_pta(wl); - if (ret < 0) - return ret; - /* FM WLAN coexistence */ ret = wl1271_acx_fm_coex(wl); if (ret < 0) @@ -572,6 +570,11 @@ int wl1271_hw_init(struct wl1271 *wl) if (ret < 0) return ret; + /* Bluetooth WLAN coexistence */ + ret = wl1271_init_pta(wl); + if (ret < 0) + return ret; + /* Default memory configuration */ ret = wl1271_acx_init_mem_config(wl); if (ret < 0) |