diff options
| author | Varun Reddy Yeturu <vyeturu@qca.qualcomm.com> | 2015-02-24 14:27:57 -0800 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2015-06-22 20:50:24 +0530 |
| commit | 0a4fb2bbb72b5a7c27d49c4616632be642cd34af (patch) | |
| tree | 118545b5704c8c69f2858ff78c13dc60d1ce6ac0 | |
| parent | 780427f512013f714a9a42c80df4952102d5d1ee (diff) | |
wlan : Enable the 11d when invalid country is set by user.
Propagation from prima to qcacld-2.0
When invalid country "XX" is set by user, driver enables 11d and
fallback to the default country from NV.
If this default country is non 00, when driver gets the callback
it disables the 11d considering it as a valid country set by user.
As a fix update the 11d country to the default country so that
driver does not disable the 11d, when invalid country is set by
user.
CRs-Fixed: 738581
Change-Id: Id337fd3b46fb97fdf3cb39062f3983b78215ef25
| -rw-r--r-- | CORE/SME/src/sme_common/sme_Api.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index 87cf4e4ddae3..53205738a6c9 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -8225,6 +8225,18 @@ eHalStatus sme_HandleChangeCountryCode(tpAniSirGlobal pMac, void *pMsgBuf) status = eHAL_STATUS_FAILURE; return status; } + /* + * Update the 11d country to default country from NV bin so that when + * callback is received for this default country, driver will not + * disable the 11d taking it as valid country by user. + */ + smsLog(pMac, LOG1, + FL + ("Set default country code (%c%c) from NV as invalid country received"), + pMsg->countryCode[0],pMsg->countryCode[1]); + vos_mem_copy(pMac->scan.countryCode11d, pMsg->countryCode, + WNI_CFG_COUNTRY_CODE_LEN); + } else { |