diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-27 23:19:33 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-27 23:19:33 -0700 |
| commit | 48c16d5d21012ed3f33971bafcaf737621fcaa4e (patch) | |
| tree | 8a865a56c70d299e9b58e4615d35452979acf776 | |
| parent | 58642b53870a494886de0195721dec47ff3a37ec (diff) | |
| parent | 12389209a1a908419aa88c8006738c3bf875ab69 (diff) | |
Merge "qcacld-2.0: Populate correct txpower in RRM Link Measurement Request" into wlan-cld2.driver.lnx.1.0-dev
| -rw-r--r-- | CORE/MAC/src/pe/rrm/rrmApi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CORE/MAC/src/pe/rrm/rrmApi.c b/CORE/MAC/src/pe/rrm/rrmApi.c index f7819da6e783..dfd44120b691 100644 --- a/CORE/MAC/src/pe/rrm/rrmApi.c +++ b/CORE/MAC/src/pe/rrm/rrmApi.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -282,7 +282,7 @@ rrmProcessLinkMeasurementRequest( tpAniSirGlobal pMac, } pHdr = WDA_GET_RX_MAC_HEADER( pRxPacketInfo ); - LinkReport.txPower = limGetMaxTxPower (pLinkReq->MaxTxPower.maxTxPower, + LinkReport.txPower = limGetMaxTxPower (pSessionEntry->maxTxPower, pLinkReq->MaxTxPower.maxTxPower, pMac->roam.configParam.nTxPowerCap); |