wlan: Add INI param to ignore HT op mode of peer AP.
Currently even if peer AP is in Legacy mode, driver
can enable 11g protection, even though there is no
11g AP in vicinity. As a part of fix, add an INI
param which will enable 11g protection only when
there is a 11g AP in vicinity.
Change-Id: Ic76e6070b02f92ef33934a0e5158fa4ef6c3e45b
CRs-Fixed: 897755
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 4ffb3b7..a5bd2cf 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -2279,6 +2279,11 @@
#define CFG_IGNORE_PEER_ERP_INFO_MAX ( 1 )
#define CFG_IGNORE_PEER_ERP_INFO_DEFAULT ( 0 )
+#define CFG_IGNORE_PEER_HT_MODE_NAME "gIgnorePeerHTopMode"
+#define CFG_IGNORE_PEER_HT_MODE_MIN ( 0 )
+#define CFG_IGNORE_PEER_HT_MODE_MAX ( 1 )
+#define CFG_IGNORE_PEER_HT_MODE_DEFAULT ( 0 )
+
#define CFG_INITIAL_DWELL_TIME_NAME "gInitialDwellTime"
#define CFG_INITIAL_DWELL_TIME_DEFAULT (0)
#define CFG_INITIAL_DWELL_TIME_MIN (0)
@@ -3021,6 +3026,7 @@
v_U32_t btcStaticOppWlanIdleBtLen;
v_U32_t linkFailTimeout;
v_U32_t linkFailTxCnt;
+ v_BOOL_t ignorePeerHTopMode;
} hdd_config_t;
/*---------------------------------------------------------------------------
Function declarations and documenation
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index cf0274a..37cac84 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3062,6 +3062,14 @@
CFG_IGNORE_PEER_ERP_INFO_MIN,
CFG_IGNORE_PEER_ERP_INFO_MAX ),
+ REG_VARIABLE( CFG_IGNORE_PEER_HT_MODE_NAME, WLAN_PARAM_Integer,
+ hdd_config_t, ignorePeerHTopMode,
+ VAR_FLAGS_OPTIONAL |
+ VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_IGNORE_PEER_HT_MODE_DEFAULT,
+ CFG_IGNORE_PEER_HT_MODE_MIN,
+ CFG_IGNORE_PEER_HT_MODE_MAX ),
+
REG_VARIABLE(CFG_INITIAL_DWELL_TIME_NAME, WLAN_PARAM_Integer,
hdd_config_t, nInitialDwellTime,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -5579,6 +5587,7 @@
smeConfig->csrConfig.nSelect5GHzMargin = pConfig->nSelect5GHzMargin;
}
smeConfig->csrConfig.ignorePeerErpInfo = pConfig->ignorePeerErpInfo;
+ smeConfig->csrConfig.ignorePeerHTopMode = pConfig->ignorePeerHTopMode;
smeConfig->csrConfig.initialScanSkipDFSCh = pConfig->initialScanSkipDFSCh;
smeConfig->csrConfig.isCoalesingInIBSSAllowed =
diff --git a/CORE/MAC/src/pe/sch/schBeaconProcess.c b/CORE/MAC/src/pe/sch/schBeaconProcess.c
index d295017..6687aec 100644
--- a/CORE/MAC/src/pe/sch/schBeaconProcess.c
+++ b/CORE/MAC/src/pe/sch/schBeaconProcess.c
@@ -202,7 +202,8 @@
//then we need to enable protection from 11g station.
//we don't need protection from 11b because if that's needed then our operating
//mode would have already been set to legacy in the previous blocks.
- if(eSIR_HT_OP_MODE_OVERLAP_LEGACY == pBcnStruct->HTInfo.opMode)
+ if(eSIR_HT_OP_MODE_OVERLAP_LEGACY == pBcnStruct->HTInfo.opMode
+ && !pMac->roam.configParam.ignorePeerHTopMode)
{
if((eSIR_HT_OP_MODE_MIXED != pMac->lim.gHTOperMode) &&
(eSIR_HT_OP_MODE_OVERLAP_LEGACY != pMac->lim.gHTOperMode))
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 4ddbe11..205f992 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -1192,6 +1192,7 @@
#endif
tANI_U32 nOBSSScanWidthTriggerInterval;
tANI_U8 roamDelayStatsEnabled;
+ tANI_BOOLEAN ignorePeerHTopMode;
}tCsrConfigParam;
//Tush
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index 579129a..d83162f 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -680,6 +680,7 @@
#endif
tANI_U32 nOBSSScanWidthTriggerInterval;
tANI_U8 roamDelayStatsEnabled;
+ tANI_BOOLEAN ignorePeerHTopMode;
}tCsrConfig;
typedef struct tagCsrChannelPowerInfo
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index bf85b31..5f814ae 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -1952,6 +1952,7 @@
pMac->roam.configParam.isAmsduSupportInAMPDU = pParam->isAmsduSupportInAMPDU;
pMac->roam.configParam.nSelect5GHzMargin = pParam->nSelect5GHzMargin;
pMac->roam.configParam.ignorePeerErpInfo = pParam->ignorePeerErpInfo;
+ pMac->roam.configParam.ignorePeerHTopMode = pParam->ignorePeerHTopMode;
pMac->roam.configParam.isCoalesingInIBSSAllowed =
pParam->isCoalesingInIBSSAllowed;
pMac->roam.configParam.allowDFSChannelRoam = pParam->allowDFSChannelRoam;
@@ -2099,6 +2100,7 @@
pParam->isAmsduSupportInAMPDU = pMac->roam.configParam.isAmsduSupportInAMPDU;
pParam->nSelect5GHzMargin = pMac->roam.configParam.nSelect5GHzMargin;
pParam->ignorePeerErpInfo = pMac->roam.configParam.ignorePeerErpInfo;
+ pParam->ignorePeerHTopMode = pMac->roam.configParam.ignorePeerHTopMode;
pParam->isCoalesingInIBSSAllowed =
pMac->roam.configParam.isCoalesingInIBSSAllowed;