wlan: Fix P2P GO slot time and hence EDCA params incorrect values
As part of slot time sessionization, a bug got introduced which sets the
slot time to long slot and EDCA params to mixed mode 11g instead of pure
11g when P2P GO comes up. This is because we removed the usage of CFG
for slot time and default slot time in CFG was 1 which was getting read
before; The fix is to set it explicitly during start bss based on
phyMode
Change-Id: I4379510c1a1c8a71f77886e370f4762da0cda2a2
CR-Fixed: 412113, 413401, 407176
diff --git a/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c b/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
index 4c33113..d533540 100644
--- a/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
+++ b/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
@@ -684,36 +684,7 @@
limUpdateConfig(pMac,psessionEntry);
- if (phyMode == WNI_CFG_PHY_MODE_11A)
- {
- // 11a mode always uses short slot
- // Check this since some APs in 11a mode broadcast long slot in their beacons. As per standard, always use what PHY mandates.
- psessionEntry->shortSlotTimeSupported = true;
- }
- else if (phyMode == WNI_CFG_PHY_MODE_11G)
- {
- if ((psessionEntry->pePersona == VOS_STA_SAP_MODE) ||
- (psessionEntry->pePersona == VOS_P2P_GO_MODE))
- {
- val = 1;
- }
-
- // Program Polaris based on AP capability
-
- if (psessionEntry->limMlmState == eLIM_MLM_WT_JOIN_BEACON_STATE)
- // Joining BSS.
- val = SIR_MAC_GET_SHORT_SLOT_TIME( psessionEntry->limCurrentBssCaps);
- else if (psessionEntry->limMlmState == eLIM_MLM_WT_REASSOC_RSP_STATE)
- // Reassociating with AP.
- val = SIR_MAC_GET_SHORT_SLOT_TIME( psessionEntry->limReassocBssCaps);
- psessionEntry->shortSlotTimeSupported = val;
- }
- else // if (phyMode == WNI_CFG_PHY_MODE_11B) - use this if another phymode is added later ON
- {
- // Will reach here in 11b case
- psessionEntry->shortSlotTimeSupported = false;
- }
- //apply protection related config.
+ psessionEntry->shortSlotTimeSupported = limGetShortSlotFromPhyMode(pMac, psessionEntry, phyMode);
#ifdef WLAN_SOFTAP_FEATURE
limSetCfgProtection(pMac, psessionEntry);
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 233184e..15cffd5 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -682,6 +682,7 @@
}
psessionEntry->ssidHidden = pSmeStartBssReq->ssidHidden;
psessionEntry->wps_state = pSmeStartBssReq->wps_state;
+ psessionEntry->shortSlotTimeSupported = limGetShortSlotFromPhyMode(pMac, psessionEntry, psessionEntry->gLimPhyMode);
break;
#endif
case eSIR_IBSS_MODE:
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index bdfdafd..4960882 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -7968,4 +7968,40 @@
return eANI_BOOLEAN_TRUE;
}
-#endif
+#endif
+
+tANI_U8 limGetShortSlotFromPhyMode(tpAniSirGlobal pMac, tpPESession psessionEntry, tANI_U32 phyMode)
+{
+ tANI_U8 val=0;
+
+ if (phyMode == WNI_CFG_PHY_MODE_11A)
+ {
+ // 11a mode always uses short slot
+ // Check this since some APs in 11a mode broadcast long slot in their beacons. As per standard, always use what PHY mandates.
+ val = true;
+ }
+ else if (phyMode == WNI_CFG_PHY_MODE_11G)
+ {
+ if ((psessionEntry->pePersona == VOS_STA_SAP_MODE) ||
+ (psessionEntry->pePersona == VOS_P2P_GO_MODE))
+ {
+ val = true;
+ }
+
+ // Program Polaris based on AP capability
+
+ if (psessionEntry->limMlmState == eLIM_MLM_WT_JOIN_BEACON_STATE)
+ // Joining BSS.
+ val = SIR_MAC_GET_SHORT_SLOT_TIME( psessionEntry->limCurrentBssCaps);
+ else if (psessionEntry->limMlmState == eLIM_MLM_WT_REASSOC_RSP_STATE)
+ // Reassociating with AP.
+ val = SIR_MAC_GET_SHORT_SLOT_TIME( psessionEntry->limReassocBssCaps);
+ }
+ else // if (phyMode == WNI_CFG_PHY_MODE_11B) - use this if another phymode is added later ON
+ {
+ // Will reach here in 11b case
+ val = false;
+ }
+ limLog(pMac, LOG1, FL("phyMode = %u shortslotsupported = %u\n"), phyMode, val);
+ return val;
+}
diff --git a/CORE/MAC/src/pe/lim/limUtils.h b/CORE/MAC/src/pe/lim/limUtils.h
index 382146a..c42e1eb 100644
--- a/CORE/MAC/src/pe/lim/limUtils.h
+++ b/CORE/MAC/src/pe/lim/limUtils.h
@@ -483,4 +483,6 @@
--------------------------------------------------------------------------*/
void peGetResumeChannel(tpAniSirGlobal pMac, tANI_U8* resumeChannel, ePhyChanBondState* resumePhyCbState);
+tANI_U8 limGetShortSlotFromPhyMode(tpAniSirGlobal pMac, tpPESession psessionEntry, tANI_U32 phyMode);
+
#endif /* __LIM_UTILS_H */