wlan:Block WiFi Direct GO mode on UNII-1 Band.
Make UNII-1 Band channels to passive channel.
GO shouldn't be started on UNII-1 band channels
(36,38,40,42,44,46,48) if regulatory domain is FCC.
CRs-Fixed: 472846
Change-Id: I87b2cc3ff6e634ef8a57cc5c0c60c3dcc151ee87
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index 1627a51..82b124f 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -137,7 +137,7 @@
void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t* pAdapter,
u8 key_index, const u8 *mac_addr, u8 *key , int key_Len);
#endif
-struct wiphy *wlan_hdd_cfg80211_init(int priv_size);
+struct wiphy *wlan_hdd_cfg80211_wiphy_alloc(int priv_size);
int wlan_hdd_cfg80211_scan( struct wiphy *wiphy,
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0))
@@ -145,11 +145,12 @@
#endif
struct cfg80211_scan_request *request);
-int wlan_hdd_cfg80211_register(struct device *dev,
+int wlan_hdd_cfg80211_init(struct device *dev,
struct wiphy *wiphy,
hdd_config_t *pCfg
);
+int wlan_hdd_cfg80211_register( struct wiphy *wiphy);
void wlan_hdd_cfg80211_post_voss_start(hdd_adapter_t* pAdapter);
void wlan_hdd_cfg80211_pre_voss_stop(hdd_adapter_t* pAdapter);
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 63ea8b2..106c9ac 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -171,6 +171,10 @@
#define WLAN_HDD_IS_SOCIAL_CHANNEL(center_freq) \
(((center_freq) == 2412) || ((center_freq) == 2437) || ((center_freq) == 2462))
+#define WLAN_HDD_CHANNEL_IN_UNII_1_BAND(center_freq) \
+(((center_freq) == 5180 ) || ((center_freq) == 5200) \
+|| ((center_freq) == 5220) || ((center_freq) == 5240))
+
#ifdef WLAN_FEATURE_11W
#define WLAN_HDD_SA_QUERY_ACTION_FRAME 8
#endif
@@ -1132,6 +1136,7 @@
VOS_STATUS hdd_enable_bmps_imps(hdd_context_t *pHddCtx);
VOS_STATUS hdd_disable_bmps_imps(hdd_context_t *pHddCtx, tANI_U8 session_type);
+void wlan_hdd_cfg80211_update_reg_info(struct wiphy *wiphy);
VOS_STATUS wlan_hdd_restart_driver(hdd_context_t *pHddCtx);
void hdd_exchange_version_and_caps(hdd_context_t *pHddCtx);
void hdd_set_pwrparams(hdd_context_t *pHddCtx);
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 50ca5b8..36032c4 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -531,12 +531,12 @@
#endif /* WLAN_NL80211_TESTMODE */
/*
- * FUNCTION: wlan_hdd_cfg80211_init
+ * FUNCTION: wlan_hdd_cfg80211_wiphy_alloc
* This function is called by hdd_wlan_startup()
* during initialization.
- * This function is used to initialize and register wiphy structure.
+ * This function is used to allocate wiphy structure.
*/
-struct wiphy *wlan_hdd_cfg80211_init(int priv_size)
+struct wiphy *wlan_hdd_cfg80211_wiphy_alloc(int priv_size)
{
struct wiphy *wiphy;
ENTER();
@@ -625,23 +625,28 @@
* during initialization.
* This function is used to initialize and register wiphy structure.
*/
-int wlan_hdd_cfg80211_register(struct device *dev,
+int wlan_hdd_cfg80211_init(struct device *dev,
struct wiphy *wiphy,
hdd_config_t *pCfg
)
{
-
int i, j;
-
+ hdd_context_t *pHddCtx = wiphy_priv(wiphy);
ENTER();
/* Now bind the underlying wlan device with wiphy */
set_wiphy_dev(wiphy, dev);
wiphy->mgmt_stypes = wlan_hdd_txrx_stypes;
-
- wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
-
+ if (memcmp(pHddCtx->cfg_ini->crdaDefaultCountryCode,
+ CFG_CRDA_DEFAULT_COUNTRY_CODE_DEFAULT , 2) != 0)
+ {
+ wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
+ }
+ else
+ {
+ wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
+ }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
wiphy->flags |= WIPHY_FLAG_HAVE_AP_SME
| WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD
@@ -768,10 +773,18 @@
wiphy->max_remain_on_channel_duration = 1000;
#endif
- /* Register our wiphy dev with cfg80211 */
+ EXIT();
+ return 0;
+}
+
+/* In this function we are registering wiphy. */
+int wlan_hdd_cfg80211_register(struct wiphy *wiphy)
+{
+ ENTER();
+ /* Register our wiphy dev with cfg80211 */
if (0 > wiphy_register(wiphy))
{
- /* print eror */
+ /* print error */
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: wiphy register failed", __func__);
return -EIO;
}
@@ -784,7 +797,7 @@
If the gCrdaDefaultCountryCode is configured in ini file,
we will try to call user space crda to get the regulatory settings for
that country. We will timeout if we can't get it from crda.
- It's called by hdd_wlan_startup() after wlan_hdd_cfg80211_register.
+ It's called by hdd_wlan_startup() after wlan_hdd_cfg80211_init.
*/
int wlan_hdd_get_crda_regd_entry(struct wiphy *wiphy, hdd_config_t *pCfg)
{
@@ -813,6 +826,45 @@
return 0;
}
+/* In this function we are updating channel list when,
+ regulatory domain is FCC and country code is US.
+ Here In FCC standard 5GHz UNII-1 Bands are indoor only.
+ As per FCC smart phone is not a indoor device.
+ GO should not opeate on indoor channels */
+void wlan_hdd_cfg80211_update_reg_info(struct wiphy *wiphy)
+{
+ int j;
+ hdd_context_t *pHddCtx = wiphy_priv(wiphy);
+ tANI_U8 defaultCountryCode[3] = SME_INVALID_COUNTRY_CODE;
+ //Default counrtycode from NV at the time of wiphy initialization.
+ if (eHAL_STATUS_SUCCESS != sme_GetDefaultCountryCodeFrmNv(pHddCtx->hHal,
+ &defaultCountryCode[0]))
+ {
+ hddLog(LOGE, FL("%s Failed to get default country code from NV"));
+ }
+ if ((defaultCountryCode[0]== 'U') && (defaultCountryCode[1]=='S'))
+ {
+ /* This will disable updating of NL channels from passive to
+ active if a beacon is received on passive channel.
+ If this flag is not disabled then nl can change passive channel to
+ active channels.
+ */
+ wiphy->flags |= WIPHY_FLAG_DISABLE_BEACON_HINTS;
+ if (NULL == wiphy->bands[IEEE80211_BAND_5GHZ])
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,"%s: wiphy->bands[IEEE80211_BAND_5GHZ] is NULL",__func__ );
+ return;
+ }
+ for (j = 0; j < wiphy->bands[IEEE80211_BAND_5GHZ]->n_channels; j++)
+ {
+ struct ieee80211_supported_band *band = wiphy->bands[IEEE80211_BAND_5GHZ];
+ // Mark UNII -1 band channel as passive
+ if (WLAN_HDD_CHANNEL_IN_UNII_1_BAND(band->channels[j].center_freq))
+ band->channels[j].flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+ }
+ }
+}
+
/* In this function we will do all post VOS start initialization.
In this function we will register for all frame in which supplicant
is interested.
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 334c389..df81f9b 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -604,6 +604,7 @@
if ((SIOCDEVPRIVATE + 1) == cmd)
{
hdd_context_t *pHddCtx = (hdd_context_t*)pAdapter->pHddCtx;
+ struct wiphy *wiphy = pHddCtx->wiphy;
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: Received %s cmd from Wi-Fi GUI***", __func__, command);
@@ -648,6 +649,14 @@
"%s: SME Change Country code fail ret=%d\n",__func__, ret);
}
+ /* If you get a 00 country code it means you are world roaming.
+ In case of world roaming, country code should be updated by
+ DRIVER COUNTRY */
+ if (memcmp(pHddCtx->cfg_ini->crdaDefaultCountryCode,
+ CFG_CRDA_DEFAULT_COUNTRY_CODE_DEFAULT , 2) == 0)
+ {
+ regulatory_hint(wiphy, "00");
+ }
}
/*
command should be a string having format
@@ -5412,7 +5421,7 @@
/*
* cfg80211: wiphy allocation
*/
- wiphy = wlan_hdd_cfg80211_init(sizeof(hdd_context_t)) ;
+ wiphy = wlan_hdd_cfg80211_wiphy_alloc(sizeof(hdd_context_t)) ;
if(wiphy == NULL)
{
@@ -5511,13 +5520,13 @@
pHddCtx->cfg_ini->nthBeaconFilter = 1;
}
/*
- * cfg80211: Initialization and registration ...
+ * cfg80211: Initialization ...
*/
- if (0 < wlan_hdd_cfg80211_register(dev, wiphy, pHddCtx->cfg_ini))
+ if (0 < wlan_hdd_cfg80211_init(dev, wiphy, pHddCtx->cfg_ini))
{
hddLog(VOS_TRACE_LEVEL_FATAL,
- "%s: wlan_hdd_cfg80211_register return failure", __func__);
- goto err_wiphy_reg;
+ "%s: wlan_hdd_cfg80211_init return failure", __func__);
+ goto err_config;
}
// Update VOS trace levels based upon the cfg.ini
@@ -5574,7 +5583,7 @@
if(!VOS_IS_STATUS_SUCCESS( status ))
{
hddLog(VOS_TRACE_LEVEL_FATAL,"%s: vos_watchdog_open failed",__func__);
- goto err_wiphy_reg;
+ goto err_wdclose;
}
}
@@ -5733,6 +5742,14 @@
__func__);
goto err_vosstop;
}
+ wlan_hdd_cfg80211_update_reg_info( wiphy );
+
+ /* registration of wiphy dev with cfg80211 */
+ if (0 > wlan_hdd_cfg80211_register(wiphy))
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,"%s: wiphy register failed", __func__);
+ goto err_vosstop;
+ }
if (VOS_STA_SAP_MODE == hdd_get_conparam())
{
@@ -5984,6 +6001,7 @@
err_close_adapter:
hdd_close_all_adapters( pHddCtx );
+ wiphy_unregister(wiphy) ;
err_vosstop:
vos_stop(pVosContext);
@@ -6004,9 +6022,6 @@
if(pHddCtx->cfg_ini->fIsLogpEnabled)
vos_watchdog_close(pVosContext);
-err_wiphy_reg:
- wiphy_unregister(wiphy) ;
-
err_config:
kfree(pHddCtx->cfg_ini);
pHddCtx->cfg_ini= NULL;
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 83804c3..df93be8 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -6776,7 +6776,7 @@
&pAdapter->disconnect_comp_var,
msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
- if(lrc <= 0) {
+ if (lrc <= 0) {
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: %s while waiting for csrRoamDisconnect ",
__func__, (0 == lrc) ? "Timeout" : "Interrupt");
@@ -6790,7 +6790,7 @@
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
sme_UpdateBgScanConfigIniChannelList(hHal, (eCsrBand) band);
#endif
- if(eHAL_STATUS_SUCCESS != sme_SetFreqBand(hHal, (eCsrBand)band))
+ if (eHAL_STATUS_SUCCESS != sme_SetFreqBand(hHal, (eCsrBand)band))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
"%s: failed to set the band value to %u ",
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index f665010..6735e44 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -3519,8 +3519,8 @@
{
smsLog(pMac, LOGW, FL("Domain Changed Old %d, new %d"),
pMac->scan.domainIdCurrent, domainId);
+ status = WDA_SetRegDomain(pMac, domainId);
}
- status = WDA_SetRegDomain(pMac, domainId);
if (status != eHAL_STATUS_SUCCESS)
{
smsLog( pMac, LOGE, FL(" fail to set regId %d"), domainId );
@@ -3887,8 +3887,7 @@
if ( domainId != pMac->scan.domainIdCurrent )
{
tSirMacChanInfo* pMacChnSet = (tSirMacChanInfo *)(&pIesLocal->Country.triplets[0]);
- WDA_SetRegDomain(pMac, domainId);
- // Check weather AP provided the 2.4GHZ list or 5GHZ list
+ // Check whether AP provided the 2.4GHZ list or 5GHZ list
if(CSR_IS_CHANNEL_24GHZ(pMacChnSet[0].firstChanNum))
{
// AP Provided the 2.4 Channels, Update the 5GHz channels from nv.bin
@@ -3899,6 +3898,9 @@
// AP Provided the 5G Channels, Update the 2.4GHZ channel list from nv.bin
csrGet24GChannels(pMac );
}
+ csrSetCfgCountryCode(pMac, pIesLocal->Country.country);
+ WDA_SetRegDomain(pMac, domainId);
+ pMac->scan.domainIdCurrent = domainId;
}
// Populate both band channel lists based on what we found in the country information...
csrSetOppositeBandChannelInfo( pMac );
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index c867534..2b31cb2 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -1974,90 +1974,31 @@
v_CONTEXT_t pVosContext = NULL;
hdd_context_t *pHddCtx = NULL;
struct wiphy *wiphy = NULL;
- v_U8_t nBandCapability;
- int i, j, k, m;
-
/* Client Context Argumant not used for PRIMA */
- if(regId >= REGDOMAIN_COUNT)
+ if (regId >= REGDOMAIN_COUNT)
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
"VOS set reg domain, invalid REG domain ID %d", regId);
return VOS_STATUS_E_INVAL;
}
+ pVosContext = vos_get_global_context(VOS_MODULE_ID_SYS, NULL);
+ if (NULL != pVosContext)
+ pHddCtx = vos_get_context(VOS_MODULE_ID_HDD, pVosContext);
+ else
+ return VOS_STATUS_E_EXISTS;
/* Set correct channel information based on REG Domain */
regChannels = pnvEFSTable->halnv.tables.regDomains[regId].channels;
- pVosContext = vos_get_global_context(VOS_MODULE_ID_SYS, NULL);
- if (NULL != pVosContext)
- pHddCtx = vos_get_context(VOS_MODULE_ID_HDD, pVosContext);
- else
- return VOS_STATUS_E_EXISTS;
-
- if (NULL == pHddCtx)
- return VOS_STATUS_E_EXISTS;
-
- wiphy = pHddCtx->wiphy;
- nBandCapability = pHddCtx->cfg_ini->nBandCapability;
-
- for (i = 0, m = 0; i < IEEE80211_NUM_BANDS; i++)
+ /* 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) && (memcmp(pHddCtx->cfg_ini->crdaDefaultCountryCode,
+ CFG_CRDA_DEFAULT_COUNTRY_CODE_DEFAULT , 2) == 0))
{
-
- if (NULL == wiphy->bands[i])
- {
- VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- "error: wiphy->bands[i] is NULL, i = %d", i);
- continue;
- }
-
- // internal channels[] is one continous array for both 2G and 5G bands
- // m is internal starting channel index for each band
- if (0 == i)
- m = 0;
- else
- m = wiphy->bands[i-1]?wiphy->bands[i-1]->n_channels + m:m;
-
- for (j = 0; j < wiphy->bands[i]->n_channels; j++)
- {
- struct ieee80211_supported_band *band = wiphy->bands[i];
-
- // k = (m + j) is internal current channel index for 20MHz channel
- // n is internal channel index for corresponding 40MHz channel
- k = m + j;
- if (IEEE80211_BAND_2GHZ == i && eCSR_BAND_5G == nBandCapability) // 5G only
- {
- // Enable social channels for P2P
- if (WLAN_HDD_IS_SOCIAL_CHANNEL(band->channels[j].center_freq) &&
- NV_CHANNEL_ENABLE == regChannels[k].enabled)
- band->channels[j].flags &= ~IEEE80211_CHAN_DISABLED;
- else
- band->channels[j].flags |= IEEE80211_CHAN_DISABLED;
- continue;
- }
- else if (IEEE80211_BAND_5GHZ == i && eCSR_BAND_24 == nBandCapability) // 2G only
- {
- band->channels[j].flags |= IEEE80211_CHAN_DISABLED;
- continue;
- }
-
- if (NV_CHANNEL_DISABLE == regChannels[k].enabled ||
- NV_CHANNEL_INVALID == regChannels[k].enabled)
- {
- band->channels[j].flags |= IEEE80211_CHAN_DISABLED;
- }
- else if (NV_CHANNEL_DFS == regChannels[k].enabled)
- {
- band->channels[j].flags &= ~IEEE80211_CHAN_DISABLED;
- band->channels[j].flags |= IEEE80211_CHAN_RADAR;
- }
- else
- {
- band->channels[j].flags &= ~(IEEE80211_CHAN_DISABLED
- |IEEE80211_CHAN_RADAR);
- }
- }
- }
-
+ wiphy = pHddCtx->wiphy;
+ regulatory_hint(wiphy, "00");
+ }
return VOS_STATUS_SUCCESS;
}
@@ -2583,6 +2524,11 @@
#endif
{
hdd_context_t *pHddCtx = wiphy_priv(wiphy);
+ v_REGDOMAIN_t domainIdCurrent;
+ tANI_U8 ccode[WNI_CFG_COUNTRY_CODE_LEN];
+ tANI_U8 uBufLen = WNI_CFG_COUNTRY_CODE_LEN;
+ tANI_U8 nBandCapability;
+ int i,j,k,m;
wiphy_dbg(wiphy, "info: cfg80211 reg_notifier callback for country"
" %c%c\n", request->alpha2[0], request->alpha2[1]);
if (request->initiator == NL80211_REGDOM_SET_BY_USER)
@@ -2621,37 +2567,150 @@
}
else if (request->initiator == NL80211_REGDOM_SET_BY_DRIVER)
{
- wiphy_dbg(wiphy, "info: set by driver\n");
+ if ( eHAL_STATUS_SUCCESS != sme_GetCountryCode(pHddCtx->hHal, ccode, &uBufLen))
+ {
+ wiphy_dbg(wiphy, "info: set by driver CCODE ERROR\n");
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
+ return;
+#else
+ return 0;
+#endif
+ }
+ if (eHAL_STATUS_SUCCESS != sme_GetRegulatoryDomainForCountry (pHddCtx->hHal,
+ ccode, (v_REGDOMAIN_t *) &domainIdCurrent))
+ {
+ wiphy_dbg(wiphy, "info: set by driver ERROR\n");
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
+ return;
+#else
+ return 0;
+#endif
+ }
+ wiphy_dbg(wiphy, "country: %c%c set by driver\n",ccode[0],ccode[1]);
/* if set by driver itself, it means driver can accept the crda
regulatory settings and wiphy->regd should be populated with crda
settings. iwiphy->bands doesn't seem to set ht40 flags in kernel
correctly, this may be fixed by later kernel */
- if (create_crda_regulatory_entry_from_regd(wiphy, request, pHddCtx->cfg_ini->nBandCapability) == 0)
- {
- pr_info("crda entry created.\n");
- if (crda_alpha2[0] == request->alpha2[0] && crda_alpha2[1] == request->alpha2[1])
- { /* first CRDA request should be from init time */
- /* Change default country code to CRDA country code, assume indoor */
- pnvEFSTable->halnv.tables.defaultCountryTable.countryCode[0] = request->alpha2[0];
- pnvEFSTable->halnv.tables.defaultCountryTable.countryCode[1] = request->alpha2[1];
- pnvEFSTable->halnv.tables.defaultCountryTable.countryCode[2] = 'I';
- pnvEFSTable->halnv.tables.defaultCountryTable.regDomain = NUM_REG_DOMAINS-1;
- wiphy_dbg(wiphy, "info: init time default country code is %c%c%c\n",
- pnvEFSTable->halnv.tables.defaultCountryTable.countryCode[0],
- pnvEFSTable->halnv.tables.defaultCountryTable.countryCode[1],
- pnvEFSTable->halnv.tables.defaultCountryTable.countryCode[2]);
- }
- else /* second or later CRDA request after init time */
- {
- wiphy_dbg(wiphy, "info: crda none-default country code is %c%c\n",
- request->alpha2[0], request->alpha2[1]);
- }
- // hdd will read regd for this country after complete
- }
- complete(&pHddCtx->driver_crda_req);
+ if (memcmp(pHddCtx->cfg_ini->crdaDefaultCountryCode,
+ CFG_CRDA_DEFAULT_COUNTRY_CODE_DEFAULT , 2) != 0)
+ {
+ if (create_crda_regulatory_entry_from_regd(wiphy, request, pHddCtx->cfg_ini->nBandCapability) == 0)
+ {
+ pr_info("crda entry created.\n");
+ if (crda_alpha2[0] == request->alpha2[0] && crda_alpha2[1] == request->alpha2[1])
+ { /* first CRDA request should be from init time */
+ /* Change default country code to CRDA country code, assume indoor */
+ pnvEFSTable->halnv.tables.defaultCountryTable.countryCode[0] = request->alpha2[0];
+ pnvEFSTable->halnv.tables.defaultCountryTable.countryCode[1] = request->alpha2[1];
+ pnvEFSTable->halnv.tables.defaultCountryTable.countryCode[2] = 'I';
+ pnvEFSTable->halnv.tables.defaultCountryTable.regDomain = NUM_REG_DOMAINS-1;
+ wiphy_dbg(wiphy, "info: init time default country code is %c%c%c\n",
+ pnvEFSTable->halnv.tables.defaultCountryTable.countryCode[0],
+ pnvEFSTable->halnv.tables.defaultCountryTable.countryCode[1],
+ pnvEFSTable->halnv.tables.defaultCountryTable.countryCode[2]);
+ }
+ else /* second or later CRDA request after init time */
+ {
+ wiphy_dbg(wiphy, "info: crda none-default country code is %c%c\n",
+ request->alpha2[0], request->alpha2[1]);
+ }
+ // hdd will read regd for this country after complete
+ }
+ complete(&pHddCtx->driver_crda_req);
+ }
+ else
+ {
+ nBandCapability = pHddCtx->cfg_ini->nBandCapability;
+ for (i=0, m=0; i<IEEE80211_NUM_BANDS; i++)
+ {
- /* Haven't seen any condition that will set by driver after init.
- If we do, then we should also call sme_ChangeCountryCode */
+ if (NULL == wiphy->bands[i])
+ {
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+ "error: wiphy->bands[i] is NULL, i = %d", i);
+ continue;
+ }
+
+ // internal channels[] is one continous array for both 2G and 5G bands
+ // m is internal starting channel index for each band
+ if (0 == i)
+ m = 0;
+ else
+ m = wiphy->bands[i-1]?wiphy->bands[i-1]->n_channels + m:m;
+
+ for (j=0; j<wiphy->bands[i]->n_channels; j++)
+ {
+ // k = (m + j) is internal current channel index for 20MHz channel
+ // n is internal channel index for corresponding 40MHz channel
+ k = m + j;
+ if (IEEE80211_BAND_2GHZ == i && eCSR_BAND_5G == nBandCapability) // 5G only
+ {
+ // Enable social channels for P2P
+ if ((2412 == wiphy->bands[i]->channels[j].center_freq ||
+ 2437 == wiphy->bands[i]->channels[j].center_freq ||
+ 2462 == wiphy->bands[i]->channels[j].center_freq ) &&
+ NV_CHANNEL_ENABLE == regChannels[k].enabled)
+ wiphy->bands[i]->channels[j].flags &= ~IEEE80211_CHAN_DISABLED;
+ else
+ wiphy->bands[i]->channels[j].flags |= IEEE80211_CHAN_DISABLED;
+ continue;
+ }
+ else if (IEEE80211_BAND_5GHZ == i && eCSR_BAND_24 == nBandCapability) // 2G only
+ {
+ wiphy->bands[i]->channels[j].flags |= IEEE80211_CHAN_DISABLED;
+ continue;
+ }
+
+ if (NV_CHANNEL_DISABLE == regChannels[k].enabled ||
+ NV_CHANNEL_INVALID == regChannels[k].enabled)
+ {
+ wiphy->bands[i]->channels[j].flags |= IEEE80211_CHAN_DISABLED;
+ }
+ else if (NV_CHANNEL_DFS == regChannels[k].enabled)
+ {
+ wiphy->bands[i]->channels[j].flags &= ~(IEEE80211_CHAN_DISABLED
+ |IEEE80211_CHAN_RADAR);
+ wiphy->bands[i]->channels[j].flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+ }
+ else
+ {
+ wiphy->bands[i]->channels[j].flags &= ~(IEEE80211_CHAN_DISABLED
+ |IEEE80211_CHAN_PASSIVE_SCAN
+ |IEEE80211_CHAN_RADAR);
+ }
+ }
+ }
+ /* Haven't seen any condition that will set by driver after init.
+ If we do, then we should also call sme_ChangeCountryCode */
+ for (j=0; j<wiphy->bands[IEEE80211_BAND_5GHZ ]->n_channels; j++)
+ {
+ // p2p UNII-1 band channels are passive when domain is FCC.
+ if ((wiphy->bands[IEEE80211_BAND_5GHZ ]->channels[j].center_freq == 5180 ||
+ wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].center_freq == 5200 ||
+ wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].center_freq == 5220 ||
+ wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].center_freq == 5240) &&
+ (ccode[0]== 'U'&& ccode[1]=='S'))
+ {
+ wiphy->bands[IEEE80211_BAND_5GHZ ]->channels[j].flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+ }
+ else if ((wiphy->bands[IEEE80211_BAND_5GHZ ]->channels[j].center_freq == 5180 ||
+ wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].center_freq == 5200 ||
+ wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].center_freq == 5220 ||
+ wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].center_freq == 5240) &&
+ (ccode[0]!= 'U'&& ccode[1]!='S'))
+ {
+ wiphy->bands[IEEE80211_BAND_5GHZ ]->channels[j].flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
+ }
+ }
+ }
+ }
+ else if (request->initiator == NL80211_REGDOM_SET_BY_CORE)
+ {
+ if (memcmp(pHddCtx->cfg_ini->crdaDefaultCountryCode,
+ CFG_CRDA_DEFAULT_COUNTRY_CODE_DEFAULT , 2) == 0)
+ {
+ request->processed = 1;
+ }
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
return;