diff options
| author | Bala Shanmugam Kamatchi <bkamatch@qti.qualcomm.com> | 2014-03-06 07:19:10 +0530 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-03-06 18:59:47 -0800 |
| commit | de4fda316f3116cd73a3b24dd99ce8266b6673bd (patch) | |
| tree | 8a4066258f8bd1934d6fd635e2a2a5f29f9e3efd | |
| parent | 9adeeabd00873a33140851af19ee2bc495ecbc49 (diff) | |
qcacld: wma: Set max TX power properly
Firmware uses different bits in the channel info
for max TX power. Set appropriate bits in channel info
while sending channel list and VDEV start WMI commands.
Change-Id: I6f540831c886ec2d198ba464d5e5ba93e6c4d807
CRs-Fixed: 611307
| -rw-r--r-- | CORE/SERVICES/WMA/wma.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index 6d8dbad5459b..ff15100fa15e 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -4313,7 +4313,7 @@ VOS_STATUS wma_update_channel_list(WMA_HANDLE handle, } - WMI_SET_CHANNEL_MAX_POWER(chan_info, + WMI_SET_CHANNEL_MAX_TX_POWER(chan_info, chan_list->chanParam[i].pwr); WMI_SET_CHANNEL_REG_POWER(chan_info, @@ -5804,6 +5804,7 @@ static VOS_STATUS wma_vdev_start(tp_wma_handle wma, cmd->dtim_period = req->dtim_period; /* FIXME: Find out min, max and regulatory power levels */ WMI_SET_CHANNEL_REG_POWER(chan, req->max_txpow); + WMI_SET_CHANNEL_MAX_TX_POWER(chan, req->max_txpow); /* TODO: Handle regulatory class, max antenna */ if (!isRestart) { @@ -8066,7 +8067,6 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) ol_txrx_peer_handle peer; VOS_STATUS status; struct wma_txrx_node *iface; - tPowerdBm maxTxPower = 0; #ifdef WLAN_FEATURE_11W int ret = 0; #endif /* WLAN_FEATURE_11W */ @@ -8126,10 +8126,8 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) req.chan_offset = add_bss->currentExtChannel; #if defined WLAN_FEATURE_VOWIFI req.max_txpow = add_bss->maxTxPower; - maxTxPower = add_bss->maxTxPower; #else req.max_txpow = 0; - maxTxPower = 0; #endif req.beacon_intval = add_bss->beaconInterval; req.dtim_period = add_bss->dtimPeriod; @@ -8198,7 +8196,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) wma_vdev_set_bss_params(wma, add_bss->staContext.smesessionId, add_bss->beaconInterval, add_bss->dtimPeriod, add_bss->shortSlotTimeSupported, add_bss->llbCoexist, - maxTxPower); + add_bss->maxTxPower); } /* * Store the bssid in interface table, bssid will |