wlan: Don't Update default country code when no country code is selected
At the time of driver load, countryCodeElected will be saved as
default country code.
If Driver changes country code through userspace, driver won't update
countryCodeElected as countryCodeElected is updated only for 11d scan.
In next scan if there are no scan results with 11d country code,
the driver will try to update country code on the basis of
countryCodeElected.
Fix this by not updating country code through 11d if
number of country code count is zero in scan results.
Change-Id: I0e5620a834dd3fef61d8a5f86ce753b9233bf56e
CRs-Fixed: 1004031
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index b0f4aa1..4401073 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -3355,8 +3355,9 @@
}
}
}
- csrElectedCountryInfo(pMac);
- csrLearnCountryInformation( pMac, NULL, NULL, eANI_BOOLEAN_TRUE );
+ if (csrElectedCountryInfo(pMac))
+ csrLearnCountryInformation(pMac, NULL, NULL,
+ eANI_BOOLEAN_TRUE);
}
end:
@@ -3856,6 +3857,8 @@
if (!pMac->scan.countryCodeCount)
{
+ VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
+ "No AP with 11d Country code is present in scan list");
return fRet;
}
maxVotes = pMac->scan.votes11d[0].votes;