diff options
| author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-03-18 06:26:30 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-03-23 16:50:19 -0400 |
| commit | 1b00f546fc4271d94c1bccb1955ce64d9ace1000 (patch) | |
| tree | f004609cc4913ae97f32c2e16fd7aad5d0aced95 /drivers/net/wireless/wl12xx/wl1271_main.c | |
| parent | 885c9907440947a4f50d4c7a93b1a45266b00b84 (diff) | |
wl1271: Add proper WLAN-BT co-ex configuration, and enable co-ex.
Add configuration values for the varous WLAN-BT co-ex configuration parameters,
and finally enable WLAN-BT co-ex. Based on preliminary measurements, it
appears the co-ex feature is not increasing WLAN power consumption, if BT
is not activated.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_main.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 62 |
1 files changed, 51 insertions, 11 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index b3abb455bd7..6501d6e2d3b 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c | |||
| @@ -48,17 +48,57 @@ | |||
| 48 | 48 | ||
| 49 | static struct conf_drv_settings default_conf = { | 49 | static struct conf_drv_settings default_conf = { |
| 50 | .sg = { | 50 | .sg = { |
| 51 | .per_threshold = 7500, | 51 | .params = { |
| 52 | .max_scan_compensation_time = 120000, | 52 | [CONF_SG_BT_PER_THRESHOLD] = 7500, |
| 53 | .nfs_sample_interval = 400, | 53 | [CONF_SG_HV3_MAX_OVERRIDE] = 0, |
| 54 | .load_ratio = 50, | 54 | [CONF_SG_BT_NFS_SAMPLE_INTERVAL] = 400, |
| 55 | .auto_ps_mode = 0, | 55 | [CONF_SG_BT_LOAD_RATIO] = 50, |
| 56 | .probe_req_compensation = 170, | 56 | [CONF_SG_AUTO_PS_MODE] = 0, |
| 57 | .scan_window_compensation = 50, | 57 | [CONF_SG_AUTO_SCAN_PROBE_REQ] = 170, |
| 58 | .antenna_config = 0, | 58 | [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_HV3] = 50, |
| 59 | .beacon_miss_threshold = 60, | 59 | [CONF_SG_ANTENNA_CONFIGURATION] = 0, |
| 60 | .rate_adaptation_threshold = CONF_HW_BIT_RATE_12MBPS, | 60 | [CONF_SG_BEACON_MISS_PERCENT] = 60, |
| 61 | .rate_adaptation_snr = 0 | 61 | [CONF_SG_RATE_ADAPT_THRESH] = 12, |
| 62 | [CONF_SG_RATE_ADAPT_SNR] = 0, | ||
| 63 | [CONF_SG_WLAN_PS_BT_ACL_MASTER_MIN_BR] = 10, | ||
| 64 | [CONF_SG_WLAN_PS_BT_ACL_MASTER_MAX_BR] = 30, | ||
| 65 | [CONF_SG_WLAN_PS_MAX_BT_ACL_MASTER_BR] = 8, | ||
| 66 | [CONF_SG_WLAN_PS_BT_ACL_SLAVE_MIN_BR] = 20, | ||
| 67 | [CONF_SG_WLAN_PS_BT_ACL_SLAVE_MAX_BR] = 50, | ||
| 68 | /* Note: with UPSD, this should be 4 */ | ||
| 69 | [CONF_SG_WLAN_PS_MAX_BT_ACL_SLAVE_BR] = 8, | ||
| 70 | [CONF_SG_WLAN_PS_BT_ACL_MASTER_MIN_EDR] = 7, | ||
| 71 | [CONF_SG_WLAN_PS_BT_ACL_MASTER_MAX_EDR] = 25, | ||
| 72 | [CONF_SG_WLAN_PS_MAX_BT_ACL_MASTER_EDR] = 20, | ||
| 73 | /* Note: with UPDS, this should be 15 */ | ||
| 74 | [CONF_SG_WLAN_PS_BT_ACL_SLAVE_MIN_EDR] = 8, | ||
| 75 | /* Note: with UPDS, this should be 50 */ | ||
| 76 | [CONF_SG_WLAN_PS_BT_ACL_SLAVE_MAX_EDR] = 40, | ||
| 77 | /* Note: with UPDS, this should be 10 */ | ||
| 78 | [CONF_SG_WLAN_PS_MAX_BT_ACL_SLAVE_EDR] = 20, | ||
| 79 | [CONF_SG_RXT] = 1200, | ||
| 80 | [CONF_SG_TXT] = 1000, | ||
| 81 | [CONF_SG_ADAPTIVE_RXT_TXT] = 1, | ||
| 82 | [CONF_SG_PS_POLL_TIMEOUT] = 10, | ||
| 83 | [CONF_SG_UPSD_TIMEOUT] = 10, | ||
| 84 | [CONF_SG_WLAN_ACTIVE_BT_ACL_MASTER_MIN_EDR] = 7, | ||
| 85 | [CONF_SG_WLAN_ACTIVE_BT_ACL_MASTER_MAX_EDR] = 15, | ||
| 86 | [CONF_SG_WLAN_ACTIVE_MAX_BT_ACL_MASTER_EDR] = 15, | ||
| 87 | [CONF_SG_WLAN_ACTIVE_BT_ACL_SLAVE_MIN_EDR] = 8, | ||
| 88 | [CONF_SG_WLAN_ACTIVE_BT_ACL_SLAVE_MAX_EDR] = 20, | ||
| 89 | [CONF_SG_WLAN_ACTIVE_MAX_BT_ACL_SLAVE_EDR] = 15, | ||
| 90 | [CONF_SG_WLAN_ACTIVE_BT_ACL_MIN_BR] = 20, | ||
| 91 | [CONF_SG_WLAN_ACTIVE_BT_ACL_MAX_BR] = 50, | ||
| 92 | [CONF_SG_WLAN_ACTIVE_MAX_BT_ACL_BR] = 10, | ||
| 93 | [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_HV3] = 200, | ||
| 94 | [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP] = 800, | ||
| 95 | [CONF_SG_PASSIVE_SCAN_A2DP_BT_TIME] = 75, | ||
| 96 | [CONF_SG_PASSIVE_SCAN_A2DP_WLAN_TIME] = 15, | ||
| 97 | [CONF_SG_HV3_MAX_SERVED] = 6, | ||
| 98 | [CONF_SG_DHCP_TIME] = 5000, | ||
| 99 | [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_A2DP] = 100, | ||
| 100 | }, | ||
| 101 | .state = CONF_SG_PROTECTIVE, | ||
| 62 | }, | 102 | }, |
| 63 | .rx = { | 103 | .rx = { |
| 64 | .rx_msdu_life_time = 512000, | 104 | .rx_msdu_life_time = 512000, |