wlan: Priority to country in .ini over country in hostapd.conf
The country code in .ini was overwritten by country code in hostapd.conf
during start_bss.
Now when the country code is present in .ini during start_bss, we will
ignore the country in hostapd.conf and set the country from .ini .
Change-Id: Ie128b63b3133a00d4ffa35b2b1b236657e073e1c
CRs-fixed: 566810
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index a4eef99..c2f5ec6 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1793,7 +1793,15 @@
{
pIe = wlan_hdd_cfg80211_get_ie_ptr(pBeacon->tail, pBeacon->tail_len,
WLAN_EID_COUNTRY);
- if(pIe)
+ if(memcmp(pHddCtx->cfg_ini->apCntryCode, CFG_AP_COUNTRY_CODE_DEFAULT, 3) != 0)
+ {
+ tANI_BOOLEAN restartNeeded;
+ pConfig->ieee80211d = 1;
+ vos_mem_copy(pConfig->countryCode, pHddCtx->cfg_ini->apCntryCode, 3);
+ sme_setRegInfo(hHal, pConfig->countryCode);
+ sme_ResetCountryCodeInformation(hHal, &restartNeeded);
+ }
+ else if(pIe)
{
tANI_BOOLEAN restartNeeded;
pConfig->ieee80211d = 1;