wlan: Process user hints for regulatory change in driver
In SAP to set country from hostapd.conf we give regulatory hint
to NL80211 which should set country in nl80211 and driver.
Regulatory hints by user were ignored by nl80211(ignore till
wiphy->regd is null as WIPHY_FLAG_STRICT_REGULATORY is set)
and by driver.
In change interface to SAP we will again give regulatory hint
from driver to allocate wiphy->regd so that nl80211 will
process hints by user.
And in wlan_hdd_crda_reg_notifier we will set country
and update the regd in driver.
These changes are for NV.bin solution only.
Change-Id: I1a0bbc14cb47c9c12cd48c66ac40cd217dd7dfaa
CRs-fixed: 570018
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 5c433d5..76abade 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -2811,7 +2811,8 @@
wlan_hdd_change_country_code_cb,
pConfig->apCntryCode, pAdapter,
pHddCtx->pvosContext,
- VOS_FALSE);
+ eSIR_FALSE,
+ eSIR_TRUE);
if (eHAL_STATUS_SUCCESS == status)
{
/* Wait for completion */
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index afbf0a4..a7daaa9 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -1730,7 +1730,7 @@
ret = (int)sme_ChangeCountryCode(pHddCtx->hHal,
(void *)(tSmeChangeCountryCallback)
wlan_hdd_change_country_code_callback,
- country_code, pAdapter, pHddCtx->pvosContext, eSIR_TRUE);
+ country_code, pAdapter, pHddCtx->pvosContext, eSIR_TRUE, eSIR_TRUE);
if (eHAL_STATUS_SUCCESS == ret)
{
ret = wait_for_completion_interruptible_timeout(
@@ -8018,7 +8018,7 @@
ret = sme_ChangeCountryCode(pHddCtx->hHal, NULL,
country_code,
pAdapter, pHddCtx->pvosContext,
- eSIR_TRUE);
+ eSIR_TRUE, eSIR_TRUE);
if (eHAL_STATUS_SUCCESS == ret)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
@@ -8178,7 +8178,13 @@
vos_set_load_unload_in_progress(VOS_MODULE_ID_VOSS, FALSE);
hdd_allow_suspend();
-
+#ifndef CONFIG_ENABLE_LINUX_REG
+ /*updating wiphy so that regulatory user hints can be processed*/
+ if (wiphy)
+ {
+ regulatory_hint(wiphy, "00");
+ }
+#endif
// Initialize the restart logic
wlan_hdd_restart_init(pHddCtx);
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 289b6ed..cb0d8e1 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -2903,6 +2903,7 @@
country_code,
pAdapter,
pHddCtx->pvosContext,
+ eSIR_TRUE,
eSIR_TRUE);
/* Wait for completion */
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 77496af..b591339 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -2228,6 +2228,7 @@
tANI_U16 msgLen; // length of the entire request
tANI_U8 countryCode[WNI_CFG_COUNTRY_CODE_LEN]; //3 char country code
tAniBool countryFromUserSpace;
+ tAniBool sendRegHint; //TRUE if we want to send hint to NL80211
void *changeCCCallback;
void *pDevContext; //device context
void *pVosContext; //voss context
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 9feb77a..b2eda0e 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -1485,6 +1485,8 @@
\param pCountry New Country Code String
+ \param sendRegHint If we want to send reg hint to nl80211
+
\return eHalStatus SUCCESS.
FAILURE or RESOURCES The API finished and failed.
@@ -1495,7 +1497,8 @@
tANI_U8 *pCountry,
void *pContext,
void* pVosContext,
- tAniBool countryFromUserSpace );
+ tAniBool countryFromUserSpace,
+ tAniBool sendRegHint);
/* ---------------------------------------------------------------------------
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 08caec1..5e2c871 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -348,7 +348,7 @@
{
regId = REGDOMAIN_WORLD;
}
- WDA_SetRegDomain(pMac, regId);
+ WDA_SetRegDomain(pMac, regId, eSIR_TRUE);
pMac->scan.domainIdDefault = regId;
pMac->scan.domainIdCurrent = pMac->scan.domainIdDefault;
vos_mem_copy(pMac->scan.countryCodeCurrent, pMac->scan.countryCodeDefault,
@@ -391,7 +391,7 @@
smsLog( pMac, LOGE, FL(" fail to get regId for country Code %.2s"), apCntryCode );
return status;
}
- status = WDA_SetRegDomain(hHal, regId);
+ status = WDA_SetRegDomain(hHal, regId, eSIR_TRUE);
if (status != eHAL_STATUS_SUCCESS)
{
smsLog( pMac, LOGE, FL(" fail to get regId for country Code %.2s"), apCntryCode );
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index a2c6e7a..b5c7527 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -3768,7 +3768,7 @@
{
smsLog(pMac, LOGW, FL("Domain Changed Old %d, new %d"),
pMac->scan.domainIdCurrent, domainId);
- status = WDA_SetRegDomain(pMac, domainId);
+ status = WDA_SetRegDomain(pMac, domainId, eSIR_TRUE);
}
if (status != eHAL_STATUS_SUCCESS)
{
@@ -4189,7 +4189,7 @@
pMac->scan.countryCodeCurrent,
WNI_CFG_COUNTRY_CODE_LEN);
/* Set Current RegDomain */
- status = WDA_SetRegDomain(pMac, domainId);
+ status = WDA_SetRegDomain(pMac, domainId, eSIR_TRUE);
if ( status != eHAL_STATUS_SUCCESS )
{
smsLog( pMac, LOGE, FL(" fail to Set regId %d"), domainId );
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 804528f..1f4e429 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -4806,6 +4806,8 @@
\param pCountry New Country Code String
+ \param sendRegHint If we want to send reg hint to nl80211
+
\return eHalStatus SUCCESS.
FAILURE or RESOURCES The API finished and failed.
@@ -4816,7 +4818,8 @@
tANI_U8 *pCountry,
void *pContext,
void* pVosContext,
- tAniBool countryFromUserSpace )
+ tAniBool countryFromUserSpace,
+ tAniBool sendRegHint )
{
eHalStatus status = eHAL_STATUS_FAILURE;
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
@@ -4853,6 +4856,7 @@
pMsg->msgLen = (tANI_U16)sizeof(tAniChangeCountryCodeReq);
vos_mem_copy(pMsg->countryCode, pCountry, 3);
pMsg->countryFromUserSpace = countryFromUserSpace;
+ pMsg->sendRegHint = sendRegHint;
pMsg->changeCCCallback = callback;
pMsg->pDevContext = pContext;
pMsg->pVosContext = pVosContext;
@@ -7136,7 +7140,7 @@
}
- status = WDA_SetRegDomain(pMac, domainIdIoctl);
+ status = WDA_SetRegDomain(pMac, domainIdIoctl, pMsg->sendRegHint);
if ( status != eHAL_STATUS_SUCCESS )
{
@@ -7236,7 +7240,7 @@
palCopyMemory(pMac->hHdd, pMac->scan.countryCodeCurrent, pMsg->countryCode,
WNI_CFG_COUNTRY_CODE_LEN);
- status = WDA_SetRegDomain(pMac, reg_domain_id);
+ status = WDA_SetRegDomain(pMac, reg_domain_id, eSIR_TRUE);
if (VOS_FALSE == is11dCountry )
{
@@ -7322,7 +7326,7 @@
WNI_CFG_COUNTRY_CODE_LEN);
}
- status = WDA_SetRegDomain(pMac, REGDOMAIN_WORLD);
+ status = WDA_SetRegDomain(pMac, REGDOMAIN_WORLD, eSIR_TRUE);
if ( status != eHAL_STATUS_SUCCESS )
{
diff --git a/CORE/VOSS/inc/vos_nvitem.h b/CORE/VOSS/inc/vos_nvitem.h
index 588fb61..ab65bcd 100644
--- a/CORE/VOSS/inc/vos_nvitem.h
+++ b/CORE/VOSS/inc/vos_nvitem.h
@@ -700,10 +700,12 @@
\brief vos_nv_setRegDomain -
\param clientCtxt - Client Context, Not used for PRIMA
regId - Regulatory Domain ID
+ sendRegHint - send hint to cfg80211
\return status set REG domain operation
\sa
-------------------------------------------------------------------------*/
-VOS_STATUS vos_nv_setRegDomain(void * clientCtxt, v_REGDOMAIN_t regId);
+VOS_STATUS vos_nv_setRegDomain(void * clientCtxt, v_REGDOMAIN_t regId,
+ v_BOOL_t sendRegHint);
/**------------------------------------------------------------------------
\brief vos_nv_getChannelEnabledState -
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index f22f43c..a664c76 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -78,6 +78,11 @@
static char linux_reg_cc[2] = {0, 0};
static v_REGDOMAIN_t temp_reg_domain = REGDOMAIN_COUNT;
+#else
+
+/* Cant access pAdapter in this file so defining a new variable to wait when changing country*/
+static struct completion change_country_code;
+
#endif
static char crda_alpha2[2] = {0, 0}; /* country code from initial crda req */
@@ -86,7 +91,6 @@
static v_BOOL_t crda_regulatory_run_time_entry_valid = VOS_FALSE;
-
/*----------------------------------------------------------------------------
* Preprocessor Definitions and Constants
* -------------------------------------------------------------------------*/
@@ -2525,10 +2529,12 @@
\brief vos_nv_setRegDomain -
\param clientCtxt - Client Context, Not used for PRIMA
regId - Regulatory Domain ID
+ sendRegHint - send hint to nl80211
\return status set REG domain operation
\sa
-------------------------------------------------------------------------*/
-VOS_STATUS vos_nv_setRegDomain(void * clientCtxt, v_REGDOMAIN_t regId)
+VOS_STATUS vos_nv_setRegDomain(void * clientCtxt, v_REGDOMAIN_t regId,
+ v_BOOL_t sendRegHint)
{
if (regId >= REGDOMAIN_COUNT)
@@ -3311,10 +3317,12 @@
\brief vos_nv_setRegDomain -
\param clientCtxt - Client Context, Not used for PRIMA
regId - Regulatory Domain ID
+ sendRegHint - send hint to nl80211
\return status set REG domain operation
\sa
-------------------------------------------------------------------------*/
-VOS_STATUS vos_nv_setRegDomain(void * clientCtxt, v_REGDOMAIN_t regId)
+VOS_STATUS vos_nv_setRegDomain(void * clientCtxt, v_REGDOMAIN_t regId,
+ v_BOOL_t sendRegHint)
{
v_CONTEXT_t pVosContext = NULL;
hdd_context_t *pHddCtx = NULL;
@@ -3338,7 +3346,7 @@
/* when CRDA is not running then we are world roaming.
In this case if 11d is enabled, then country code should
be update on basis of world roaming */
- if (NULL != pHddCtx)
+ if (NULL != pHddCtx && sendRegHint)
{
wiphy = pHddCtx->wiphy;
regulatory_hint(wiphy, "00");
@@ -3482,7 +3490,15 @@
return VOS_STATUS_E_EXISTS;
}
}
-
+/* FUNCTION: vos_nv_change_country_code_cb
+* to wait for contry code completion
+*/
+void* vos_nv_change_country_code_cb(void *pAdapter)
+{
+ struct completion *change_code_cng = pAdapter;
+ complete(change_code_cng);
+ return NULL;
+}
/*
* Function: wlan_hdd_crda_reg_notifier
@@ -3510,13 +3526,47 @@
" %c%c\n", request->alpha2[0], request->alpha2[1]);
if (request->initiator == NL80211_REGDOM_SET_BY_USER)
{
+ int status;
wiphy_dbg(wiphy, "info: set by user\n");
- if (create_crda_regulatory_entry(wiphy, request, pHddCtx->cfg_ini->nBandCapability) != 0)
+ init_completion(&change_country_code);
+ /* We will process hints by user from nl80211 in driver.
+ * sme_ChangeCountryCode will set the country to driver
+ * and update the regdomain.
+ * when we return back to nl80211 from this callback, the nl80211 will
+ * send NL80211_CMD_REG_CHANGE event to the hostapd waking it up to
+ * query channel list from nl80211. Thus we need to update the channels
+ * according to reg domain set by user before returning to nl80211 so
+ * that hostapd will gets the updated channels.
+ * The argument sendRegHint in sme_ChangeCountryCode is
+ * set to eSIR_FALSE (hint is from nl80211 and thus
+ * no need to notify nl80211 back)*/
+ status = sme_ChangeCountryCode(pHddCtx->hHal,
+ (void *)(tSmeChangeCountryCallback)
+ vos_nv_change_country_code_cb,
+ request->alpha2,
+ &change_country_code,
+ pHddCtx->pvosContext,
+ eSIR_FALSE,
+ eSIR_FALSE);
+ if (eHAL_STATUS_SUCCESS == status)
+ {
+ status = wait_for_completion_interruptible_timeout(
+ &change_country_code,
+ msecs_to_jiffies(WLAN_WAIT_TIME_COUNTRY));
+ if(status <= 0)
+ {
+ wiphy_dbg(wiphy, "info: set country timed out\n");
+ }
+ }
+ else
+ {
+ wiphy_dbg(wiphy, "info: unable to set country by user\n");
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
return;
#else
return 0;
#endif
+ }
// ToDo
/* Don't change default country code to CRDA country code by user req */
/* Shouldcall sme_ChangeCountryCode to send a message to trigger read
@@ -3524,7 +3574,8 @@
//sme_ChangeCountryCode(pHddCtx->hHal, NULL,
// &country_code[0], pAdapter, pHddCtx->pvosContext);
}
- else if (request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE)
+
+ if (request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE)
{
wiphy_dbg(wiphy, "info: set by country IE\n");
if (create_crda_regulatory_entry(wiphy, request, pHddCtx->cfg_ini->nBandCapability) != 0)
@@ -3543,7 +3594,8 @@
// &country_code[0], pAdapter, pHddCtx->pvosContext);
}
else if (request->initiator == NL80211_REGDOM_SET_BY_DRIVER ||
- (request->initiator == NL80211_REGDOM_SET_BY_CORE))
+ (request->initiator == NL80211_REGDOM_SET_BY_CORE)||
+ (request->initiator == NL80211_REGDOM_SET_BY_USER))
{
if ( eHAL_STATUS_SUCCESS != sme_GetCountryCode(pHddCtx->hHal, ccode, &uBufLen))
{
diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h
index 953e93b..379658b 100644
--- a/CORE/WDA/inc/wlan_qct_wda.h
+++ b/CORE/WDA/inc/wlan_qct_wda.h
@@ -1123,7 +1123,8 @@
tSirRetStatus wdaPostCtrlMsg(tpAniSirGlobal pMac, tSirMsgQ *pMsg);
-eHalStatus WDA_SetRegDomain(void * clientCtxt, v_REGDOMAIN_t regId);
+eHalStatus WDA_SetRegDomain(void * clientCtxt, v_REGDOMAIN_t regId,
+ tAniBool sendRegHint);
#define HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME 0x40 // Bit 6 will be used to control BD rate for Management frames
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index cc97bad..52141d4 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -13212,9 +13212,10 @@
/*
* WDA Set REG Domain to VOS NV
*/
-eHalStatus WDA_SetRegDomain(void * clientCtxt, v_REGDOMAIN_t regId)
+eHalStatus WDA_SetRegDomain(void * clientCtxt, v_REGDOMAIN_t regId,
+ tAniBool sendRegHint)
{
- if(VOS_STATUS_SUCCESS != vos_nv_setRegDomain(clientCtxt, regId))
+ if(VOS_STATUS_SUCCESS != vos_nv_setRegDomain(clientCtxt, regId, sendRegHint))
{
return eHAL_STATUS_INVALID_PARAMETER;
}