commit a9eb9ad204c4e71f477c20071a8809395aa61825
author Sandeep Puligilla <spuligil@qti.qualcomm.com> Tue May 27 14:42:50 2014 +0530
committer Kiet Lam <c_kietl@qca.qualcomm.com> Sat Aug 09 23:05:40 2014 -0700
tree 31059102bd26fd25c26ea3288993a99cf6862672
parent 18da5b4c6b1992f829b751a4631b205d000e66bc

wlan: Update the maximum transit power of an STA.

According to the spec, the local maximum transmit power for a channel
is defined as the maximum transmit powerlevel specified for the
channel in the Country element minus the local power constraint
specified for the channel in the Power Constraint element. This
fix updates the max transmit power according to the spec before
sending it to the FW.

Change-Id: I30c3ec5054651863cd200f92528b7dffa74403d1
CRS-Fixed: 679356

CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c

diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index cc0e813..9b55421 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -1952,6 +1952,7 @@
            psessionEntry->pLimJoinReq->bssDescription.capabilityInfo;
 
         regMax = cfgGetRegulatoryMaxTransmitPower( pMac, psessionEntry->currentOperChannel ); 
+        localPowerConstraint = regMax;
         limExtractApCapability( pMac,
            (tANI_U8 *) psessionEntry->pLimJoinReq->bssDescription.ieFields,
            limGetIElenFromBssDescription(&psessionEntry->pLimJoinReq->bssDescription),
@@ -1961,12 +1962,7 @@
            , &localPowerConstraint,
            psessionEntry
            );
-        /* If power constraint is zero then update it with Region max.
-                 MaxTxpower will be the MIN of regmax and power constraint */
-        if( localPowerConstraint == 0 )
-        {
-          localPowerConstraint = regMax;
-        }
+
 #ifdef FEATURE_WLAN_ESE
             psessionEntry->maxTxPower = limGetMaxTxPower(regMax, localPowerConstraint, pMac->roam.configParam.nTxPowerCap);
 #else