wlan:CCX:DUT TPC value is above AP's Max Tx power
-Extended extraction of CCX Tx Power IE in beacon structure.
-To configure the DUT Max Tx Power value,calcualte the minimum of
localpowerconstraint,CCX Tx power IE and .ini configured value.
As part of the CCX 5.8.1 testcase AP transmits Max Transmit
power value in the CCX Tx IE.DUT should extract it and
configure the hardware accordingly.
Change-Id: I6db191a4a204d7624d0bd94562afe08eb544cd0d
CRs-Fixed: 520946
diff --git a/CORE/MAC/src/pe/sch/schBeaconProcess.c b/CORE/MAC/src/pe/sch/schBeaconProcess.c
index e961130..1b6a178 100644
--- a/CORE/MAC/src/pe/sch/schBeaconProcess.c
+++ b/CORE/MAC/src/pe/sch/schBeaconProcess.c
@@ -340,7 +340,9 @@
tANI_U8 operMode;
tANI_U8 chWidth = 0;
#endif
-
+#if defined FEATURE_WLAN_CCX || defined FEATURE_WLAN_VOWIFI
+ tPowerdBm regMax = 0,maxTxPower = 0;
+#endif
beaconParams.paramChangeBitmap = 0;
@@ -356,11 +358,9 @@
* -- Infra STA receving beacons from AP
* -- BTAMP_STA receving beacons from BTAMP_AP
*/
-
-
//Always save the beacon into LIM's cached scan results
limCheckAndAddBssDescription(pMac, pBeacon, pRxPacketInfo, eANI_BOOLEAN_FALSE, eANI_BOOLEAN_FALSE);
-
+
/**
* This is the Beacon received from the AP we're currently associated with. Check
* if there are any changes in AP's capabilities
@@ -413,7 +413,6 @@
//SMAC already parses TIM bit.
}
-
if(pMac->lim.gLimProtectionControl != WNI_CFG_FORCE_POLICY_PROTECTION_DISABLE)
limDecideStaProtection(pMac, pBeacon, &beaconParams, psessionEntry);
@@ -470,7 +469,7 @@
else if (psessionEntry->gLimSpecMgmt.dot11hChanSwState == eLIM_11H_CHANSW_RUNNING)
{
limCancelDot11hChannelSwitch(pMac, psessionEntry);
- }
+ }
}
#ifdef WLAN_FEATURE_11AC
@@ -587,56 +586,51 @@
}
#endif
+#if defined (FEATURE_WLAN_CCX) || defined (FEATURE_WLAN_VOWIFI)
+ /* Obtain the Max Tx power for the current regulatory */
+ regMax = cfgGetRegulatoryMaxTransmitPower( pMac, psessionEntry->currentOperChannel );
+#endif
+
+#if defined FEATURE_WLAN_VOWIFI
+ {
+ tPowerdBm localRRMConstraint = 0;
+ if ( pMac->rrm.rrmPEContext.rrmEnable && pBeacon->powerConstraintPresent )
+ {
+ localRRMConstraint = pBeacon->localPowerConstraint.localPowerConstraints;
+ }
+ else
+ {
+ localRRMConstraint = 0;
+ }
+ maxTxPower = VOS_MIN(regMax,(regMax - localRRMConstraint));
+ }
+#elif defined FEATURE_WLAN_CCX
+ maxTxPower = regMax;
+#endif
+
#if defined FEATURE_WLAN_CCX
- if( psessionEntry->isCCXconnection )
+ if( psessionEntry->isCCXconnection )
+ {
+ tPowerdBm localCCXConstraint = 0;
+ if (pBeacon->ccxTxPwr.present)
{
- tPowerdBm localConstraint = 0, regMax = 0, maxTxPower = 0;
- if (pBeacon->ccxTxPwr.present)
- {
- localConstraint = pBeacon->ccxTxPwr.power_limit;
- regMax = cfgGetRegulatoryMaxTransmitPower( pMac, psessionEntry->currentOperChannel );
- maxTxPower = limGetMaxTxPower(regMax, localConstraint, pMac->roam.configParam.nTxPowerCap);
+ localCCXConstraint = pBeacon->ccxTxPwr.power_limit;
+ maxTxPower = limGetMaxTxPower(maxTxPower, localCCXConstraint, pMac->roam.configParam.nTxPowerCap);
+ }
+ limLog( pMac, LOG1, "RegMax = %d, localCcxCons = %d, MaxTx = %d", regMax, localCCXConstraint, maxTxPower );
+ }
+#endif
- //If maxTxPower is increased or decreased
- if( maxTxPower != psessionEntry->maxTxPower )
- {
- limLog( pMac, LOG1, "RegMax = %d, lpc = %d, MaxTx = %d", regMax, localConstraint, maxTxPower );
- limLog( pMac, LOG1, "Local power constraint change..updating new maxTx power to HAL");
- if( limSendSetMaxTxPowerReq ( pMac, maxTxPower, psessionEntry ) == eSIR_SUCCESS )
+#if defined (FEATURE_WLAN_CCX) || defined (FEATURE_WLAN_VOWIFI)
+ {
+ //If maxTxPower is increased or decreased
+ if( maxTxPower != psessionEntry->maxTxPower )
+ {
+ limLog( pMac, LOG1, "Local power constraint change..updating new maxTx power %d to HAL",maxTxPower);
+ if( limSendSetMaxTxPowerReq ( pMac, maxTxPower, psessionEntry ) == eSIR_SUCCESS )
psessionEntry->maxTxPower = maxTxPower;
- }
- }
}
-#endif
-
-
-#if defined WLAN_FEATURE_VOWIFI
- if( pMac->rrm.rrmPEContext.rrmEnable )
- {
- tPowerdBm localConstraint = 0, regMax = 0, maxTxPower = 0;
- if (pBeacon->powerConstraintPresent && pMac->rrm.rrmPEContext.rrmEnable)
- {
- localConstraint = pBeacon->localPowerConstraint.localPowerConstraints;
- }
- else
- {
- localConstraint = 0;
- }
- regMax = cfgGetRegulatoryMaxTransmitPower( pMac, psessionEntry->currentOperChannel );
- //Get the maxTxPower in the range of 13 to 19
- maxTxPower = rrmGetMinOfMaxTxPower(regMax, (regMax - localConstraint));
- //If maxTxPower is increased or decreased
- if( maxTxPower != psessionEntry->maxTxPower )
- {
-#if defined WLAN_VOWIFI_DEBUG
- limLog( pMac, LOGE, "Regulatory max = %d, local power constraint = %d, max tx = %d", regMax, localConstraint, maxTxPower );
- limLog( pMac, LOGE, "Local power constraint change..updating mew maxTx power to HAL");
-#endif
- if( rrmSendSetMaxTxPowerReq ( pMac, maxTxPower, psessionEntry ) == eSIR_SUCCESS )
- psessionEntry->maxTxPower = maxTxPower;
-
- }
- }
+ }
#endif
// Indicate to LIM that Beacon is received