summaryrefslogtreecommitdiff
path: root/CORE/MAC/src
diff options
context:
space:
mode:
authorSandeep Puligilla <spuligil@qca.qualcomm.com>2015-06-18 23:54:22 -0700
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2015-06-23 20:39:33 +0530
commitef46b389723aae8ea597ff4c870909e98b260261 (patch)
tree18abdd1a07e3513cc75e2b702e28d86c640782de /CORE/MAC/src
parent2baa1017cb167f6039c8b0e9d2e5d09a28aeeaf3 (diff)
wlan: HT20 Protection Mode
HT20 protection mode should be enabled when there is atleast one STA associated to SAP is HT20 only capable. Change-Id: Ica220c36b37ddd4f8bc1f577eb00eeed333ed476 CRs-Fixed: 857236
Diffstat (limited to 'CORE/MAC/src')
-rw-r--r--CORE/MAC/src/pe/lim/limUtils.c32
1 files changed, 22 insertions, 10 deletions
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index d274b6c5f774..68d6592356f4 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -3574,9 +3574,13 @@ limEnable11gProtection(tpAniSirGlobal pMac, tANI_U8 enable,
}
else if(psessionEntry->gLimHt20Params.protectionEnabled)
{
- //Commenting because of CR 258588 WFA cert
- //psessionEntry->htOperMode = eSIR_HT_OP_MODE_NO_LEGACY_20MHZ_HT;
- psessionEntry->htOperMode = eSIR_HT_OP_MODE_PURE;
+ if(eHT_CHANNEL_WIDTH_20MHZ ==
+ psessionEntry->htSupportedChannelWidthSet)
+ psessionEntry->htOperMode =
+ eSIR_HT_OP_MODE_PURE;
+ else
+ psessionEntry->htOperMode =
+ eSIR_HT_OP_MODE_NO_LEGACY_20MHZ_HT;
PELOGE(limLog(pMac, LOG1, FL("===> 11G Protection Disabled"));)
limEnableHtRifsProtection(pMac, false, overlap, pBeaconParams,psessionEntry);
}
@@ -3815,9 +3819,13 @@ limEnableHtProtectionFrom11g(tpAniSirGlobal pMac, tANI_U8 enable,
limEnableHtOBSSProtection(pMac, false, overlap, pBeaconParams,psessionEntry);
if(psessionEntry->gLimHt20Params.protectionEnabled){
- //Commenting because of CR 258588 WFA cert
- //psessionEntry->htOperMode = eSIR_HT_OP_MODE_NO_LEGACY_20MHZ_HT;
- psessionEntry->htOperMode = eSIR_HT_OP_MODE_PURE;
+ if(eHT_CHANNEL_WIDTH_20MHZ ==
+ psessionEntry->htSupportedChannelWidthSet)
+ psessionEntry->htOperMode =
+ eSIR_HT_OP_MODE_PURE;
+ else
+ psessionEntry->htOperMode =
+ eSIR_HT_OP_MODE_NO_LEGACY_20MHZ_HT;
}
else
psessionEntry->htOperMode = eSIR_HT_OP_MODE_PURE;
@@ -3848,9 +3856,13 @@ limEnableHtProtectionFrom11g(tpAniSirGlobal pMac, tANI_U8 enable,
}
else if(psessionEntry->gLimHt20Params.protectionEnabled)
{
- //Commenting because of CR 258588 WFA cert
- //psessionEntry->htOperMode = eSIR_HT_OP_MODE_NO_LEGACY_20MHZ_HT;
- psessionEntry->htOperMode = eSIR_HT_OP_MODE_PURE;
+ if(eHT_CHANNEL_WIDTH_20MHZ ==
+ psessionEntry->htSupportedChannelWidthSet)
+ psessionEntry->htOperMode =
+ eSIR_HT_OP_MODE_PURE;
+ else
+ psessionEntry->htOperMode =
+ eSIR_HT_OP_MODE_NO_LEGACY_20MHZ_HT;
limEnableHtRifsProtection(pMac, false, overlap, pBeaconParams,psessionEntry);
}
else
@@ -3863,7 +3875,7 @@ limEnableHtProtectionFrom11g(tpAniSirGlobal pMac, tANI_U8 enable,
if(!psessionEntry->gLimOverlap11gParams.protectionEnabled &&
!psessionEntry->gLim11gParams.protectionEnabled)
{
- PELOG1(limLog(pMac, LOG1, FL("===> Protection from 11G Disabled"));)
+ limLog(pMac, LOG1, FL("===> Protection from 11G Disabled"));
pBeaconParams->llgCoexist = psessionEntry->beaconParams.llgCoexist = false;
pBeaconParams->paramChangeBitmap |= PARAM_llGCOEXIST_CHANGED;
}