Revert "wlan: Support to disable 11ac dynamically."
This reverts commit d86a14e9f5b5a1fb0e9a7deab1552221f72304bd.
diff --git a/CORE/HDD/inc/wlan_hdd_assoc.h b/CORE/HDD/inc/wlan_hdd_assoc.h
index f6aac61..b056d28 100644
--- a/CORE/HDD/inc/wlan_hdd_assoc.h
+++ b/CORE/HDD/inc/wlan_hdd_assoc.h
@@ -113,9 +113,6 @@
/** Remembers authenticated state */
v_U8_t uIsAuthenticated;
-
- /** Dot11Mode */
- tANI_U32 dot11Mode;
}connection_info_t;
/*Forward declaration of Adapter*/
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 8d6add1..68b2ce9 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -1697,8 +1697,18 @@
#define CFG_LIST_OF_NON_DFS_COUNTRY_CODE "gListOfNonDfsCountryCode"
#define CFG_LIST_OF_NON_DFS_COUNTRY_CODE_DEFAULT "JO,MA"
-#define CFG_LIST_OF_NON_11AC_COUNTRY_CODE "gListOfNon11acCountryCode"
-#define CFG_LIST_OF_NON_11AC_COUNTRY_CODE_DEFAULT "RU,UA,ZA"
+/*
+ * IBSS Operating Channels for 2.4G and 5GHz channels
+ */
+#define CFG_IBSS_ADHOC_CHANNEL_5GHZ_NAME "gAdHocChannel5G"
+#define CFG_IBSS_ADHOC_CHANNEL_5GHZ_MIN ( 36 )
+#define CFG_IBSS_ADHOC_CHANNEL_5GHZ_MAX ( 165 )
+#define CFG_IBSS_ADHOC_CHANNEL_5GHZ_DEFAULT ( 44 )
+
+#define CFG_IBSS_ADHOC_CHANNEL_24GHZ_NAME "gAdHocChannel24G"
+#define CFG_IBSS_ADHOC_CHANNEL_24GHZ_MIN ( 1 )
+#define CFG_IBSS_ADHOC_CHANNEL_24GHZ_MAX ( 14 )
+#define CFG_IBSS_ADHOC_CHANNEL_24GHZ_DEFAULT ( 6 )
/*---------------------------------------------------------------------------
Type declarations
@@ -2066,7 +2076,6 @@
v_U8_t retryLimitTwo;
char listOfNonDfsCountryCode[128];
v_BOOL_t enableSSR;
- char listOfNon11acCountryCode[128];
} hdd_config_t;
/*---------------------------------------------------------------------------
Function declarations and documenation
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 8dd8974..4689092 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -298,9 +298,6 @@
// Save the ssid for the connection
vos_mem_copy( &pHddStaCtx->conn_info.SSID.SSID, &pRoamInfo->u.pConnectedProfile->SSID, sizeof( tSirMacSSid ) );
-
- // Save dot11mode in which STA associated to AP
- pHddStaCtx->conn_info.dot11Mode = pRoamInfo->u.pConnectedProfile->dot11Mode;
}
}
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 08babb2..5e1baaf 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -2207,12 +2207,6 @@
CFG_ENABLE_SSR_MIN,
CFG_ENABLE_SSR_MAX,
cbNotifySetEnableSSR, 0 ),
-
-REG_VARIABLE_STRING( CFG_LIST_OF_NON_11AC_COUNTRY_CODE, WLAN_PARAM_String,
- hdd_config_t, listOfNon11acCountryCode,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- (void *)CFG_LIST_OF_NON_11AC_COUNTRY_CODE_DEFAULT),
-
};
/*
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 4703003..c7bc76c 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -408,69 +408,6 @@
}
}
-void hdd_checkandupdate_phymode( hdd_adapter_t *pAdapter, char *country_code)
-{
- hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
- hdd_config_t *cfg_param;
- eCsrPhyMode phyMode;
-
- if (NULL == pHddCtx)
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "HDD Context is null !!");
- return ;
- }
-
- cfg_param = pHddCtx->cfg_ini;
-
- if (NULL == cfg_param)
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "cfg_params not available !!");
- return ;
- }
-
- phyMode = sme_GetPhyMode(WLAN_HDD_GET_HAL_CTX(pAdapter));
-
- if (NULL != strstr(cfg_param->listOfNon11acCountryCode, country_code))
- {
- if ((eCSR_DOT11_MODE_AUTO == phyMode) ||
- (eCSR_DOT11_MODE_11ac == phyMode) ||
- (eCSR_DOT11_MODE_11ac_ONLY == phyMode))
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "Setting phymode to 11n!!");
- sme_SetPhyMode(WLAN_HDD_GET_HAL_CTX(pAdapter), eCSR_DOT11_MODE_11n);
- }
- }
- else
- {
- /*New country Supports 11ac as well resetting value back from .ini*/
- sme_SetPhyMode(WLAN_HDD_GET_HAL_CTX(pAdapter),
- hdd_cfg_xlate_to_csr_phy_mode(cfg_param->dot11Mode));
- return ;
- }
-
- if ((eConnectionState_Associated == pHddStaCtx->conn_info.connState) &&
- ((eCSR_CFG_DOT11_MODE_11AC_ONLY == pHddStaCtx->conn_info.dot11Mode) ||
- (eCSR_CFG_DOT11_MODE_11AC == pHddStaCtx->conn_info.dot11Mode)))
- {
- VOS_STATUS vosStatus;
-
- // need to issue a disconnect to CSR.
- INIT_COMPLETION(pAdapter->disconnect_comp_var);
- vosStatus = sme_RoamDisconnect(WLAN_HDD_GET_HAL_CTX(pAdapter),
- pAdapter->sessionId,
- eCSR_DISCONNECT_REASON_UNSPECIFIED );
-
- if (VOS_STATUS_SUCCESS == vosStatus)
- wait_for_completion_interruptible_timeout(&pAdapter->disconnect_comp_var,
- msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
-
- }
-}
-
void hdd_checkandupdate_dfssetting( hdd_adapter_t *pAdapter, char *country_code)
{
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
@@ -593,7 +530,6 @@
country_code = command + 8;
hdd_checkandupdate_dfssetting(pAdapter, country_code);
- hdd_checkandupdate_phymode(pAdapter, country_code);
ret = (int)sme_ChangeCountryCode(pHddCtx->hHal, NULL, country_code,
pAdapter, pHddCtx->pvosContext);
if( 0 != ret )
@@ -641,7 +577,6 @@
}
hdd_checkandupdate_dfssetting(pAdapter, countryCode);
- hdd_checkandupdate_phymode(pAdapter, countryCode);
ret = (int)sme_ChangeCountryCode(pHddCtx->hHal, NULL, countryCode,
pAdapter, pHddCtx->pvosContext);
if (0 != ret)
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 711292a..2f195cf 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -927,7 +927,6 @@
tCsrCcxCckmInfo ccxCckmInfo;
tANI_BOOLEAN isCCXAssoc;
#endif
- tANI_U32 dot11Mode;
}tCsrRoamConnectedProfile;
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index f582fab..f697ed3 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -2751,32 +2751,4 @@
*/
void sme_UpdateEnableSSR(tHalHandle hHal, tANI_BOOLEAN enableSSR);
-/* ---------------------------------------------------------------------------
-
- \fn sme_SetPhyMode
-
- \brief Changes the PhyMode.
-
- \param hHal - The handle returned by macOpen.
-
- \param phyMode new phyMode which is to set
-
- \return eHalStatus SUCCESS.
-
- -------------------------------------------------------------------------------*/
-eHalStatus sme_SetPhyMode(tHalHandle hHal, eCsrPhyMode phyMode);
-
-/* ---------------------------------------------------------------------------
-
- \fn sme_GetPhyMode
-
- \brief gets current PhyMode.
-
- \param hHal - The handle returned by macOpen.
-
- \return eHalStatus PhyMode
-
- -------------------------------------------------------------------------------*/
-eCsrPhyMode sme_GetPhyMode(tHalHandle hHal);
-
#endif //#if !defined( __SME_API_H )
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 074f975..6ff3105 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -5150,7 +5150,6 @@
pSession->connectedProfile.modifyProfileFields.uapsd_mask);
pmcStartUapsd( pMac, NULL, NULL );
}
- pSession->connectedProfile.dot11Mode = pSession->bssParams.uCfgDot11Mode;
roamInfo.u.pConnectedProfile = &pSession->connectedProfile;
if( pSession->bRefAssocStartCnt > 0 )
{
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index a995be1..caab00b 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -2361,38 +2361,6 @@
}
/* ---------------------------------------------------------------------------
-
- \fn sme_SetPhyMode
-
- \brief Changes the PhyMode.
-
- \param hHal - The handle returned by macOpen.
-
- \param phyMode new phyMode which is to set
-
- \return eHalStatus SUCCESS.
-
- -------------------------------------------------------------------------------*/
-eHalStatus sme_SetPhyMode(tHalHandle hHal, eCsrPhyMode phyMode)
-{
- tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
-
- if (NULL == pMac)
- {
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s: invalid context", __func__);
- return eHAL_STATUS_FAILURE;
- }
-
- pMac->roam.configParam.phyMode = phyMode;
- pMac->roam.configParam.uCfgDot11Mode = csrGetCfgDot11ModeFromCsrPhyMode(NULL,
- pMac->roam.configParam.phyMode,
- pMac->roam.configParam.ProprietaryRatesEnabled);
-
- return eHAL_STATUS_SUCCESS;
-}
-
-/* ---------------------------------------------------------------------------
\fn sme_RoamReassoc
\brief a wrapper function to request CSR to inititiate a re-association
\param pProfile - can be NULL to join the currently connected AP. In that
diff --git a/firmware_bin/WCNSS_qcom_cfg.ini b/firmware_bin/WCNSS_qcom_cfg.ini
index e296fd8..3850147 100644
--- a/firmware_bin/WCNSS_qcom_cfg.ini
+++ b/firmware_bin/WCNSS_qcom_cfg.ini
@@ -378,11 +378,6 @@
#Enable thermal mitigation
gThermalMitigationEnable=1
-
-#List of Country codes for which 11ac needs to be disabled
-#Each country code must be delimited by comma(,)
-gListOfNon11acCountryCode=RU,UA,ZA
-
END
# Note: Configuration parser would not read anything past the END marker