wlan: Updating country code on best AP in scan list.
Country code with 11d should be updated at once in one scan.
The criteria to choose best AP should be on basis of best RSSI.
Moreover, Next time country Code should update when in next scan,
best AP has atleast 30% less rssi than current AP's Rssi.
CRs-Fixed: 545795
Change-Id: If03c219cbe7940209af01b2e39227681996b4e46
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index 7a71c56..274ef34 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -727,6 +727,7 @@
tANI_U8 countryCode11d[WNI_CFG_COUNTRY_CODE_LEN];
v_REGDOMAIN_t domainIdDefault; //default regulatory domain
v_REGDOMAIN_t domainIdCurrent; //current regulatory domain
+ tCsrBssid currentCountryBssid; // Bssid for current country code
tANI_BOOLEAN f11dInfoApplied;
tANI_BOOLEAN fCancelIdleScan;
#ifdef FEATURE_WLAN_WAPI
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 6217000..44922eb 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -119,6 +119,8 @@
#define MAX_COUNTRY_IGNORE 4
+#define THIRTY_PERCENT(x) (x*30/100);
+
/*struct to hold the ignored channel list based on country */
typedef struct sCsrIgnoreChannels
{
@@ -2853,8 +2855,11 @@
static void csrMoveTempScanResultsToMainList( tpAniSirGlobal pMac, tANI_U8 reason )
{
tListElem *pEntry;
+ tListElem *pEntryTemp;
+ tListElem *pNext;
tCsrScanResult *pBssDescription;
tANI_S8 cand_Bss_rssi;
+ tANI_S8 rssi_of_current_country;
tANI_BOOLEAN fDupBss;
#ifdef FEATURE_WLAN_WAPI
tANI_BOOLEAN fNewWapiBSSForCurConnection = eANI_BOOLEAN_FALSE;
@@ -2863,9 +2868,11 @@
tANI_U32 sessionId = CSR_SESSION_ID_INVALID;
tAniSSID tmpSsid;
v_TIME_t timer=0;
+ tCsrBssid bssid_temp = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
tmpSsid.length = 0;
cand_Bss_rssi = -128; // RSSI coming from PE is -ve
+ rssi_of_current_country = -128;
// remove the BSS descriptions from temporary list
while( ( pEntry = csrLLRemoveTail( &pMac->scan.tempScanResults, LL_ACCESS_LOCK ) ) != NULL)
@@ -2937,32 +2944,89 @@
}
}
- //Tush: find a good AP for 11d info
- if( csrIs11dSupported( pMac ) )
+ //Find a good AP for 11d info
+ if ( csrIs11dSupported( pMac ) )
{
- if(cand_Bss_rssi < pBssDescription->Result.BssDescriptor.rssi)
+ if (cand_Bss_rssi < pBssDescription->Result.BssDescriptor.rssi)
{
// check if country information element is present
- if(pIesLocal->Country.present)
+ if (pIesLocal->Country.present)
{
cand_Bss_rssi = pBssDescription->Result.BssDescriptor.rssi;
- // learn country information
- csrLearnCountryInformation( pMac, &pBssDescription->Result.BssDescriptor,
- pIesLocal, eANI_BOOLEAN_TRUE );
+ smsLog(pMac, LOGW, FL("11d AP Bssid " MAC_ADDRESS_STR
+ " chan= %d, rssi = -%d, countryCode %c%c"),
+ MAC_ADDR_ARRAY( pBssDescription->Result.BssDescriptor.bssId),
+ pBssDescription->Result.BssDescriptor.channelId,
+ pBssDescription->Result.BssDescriptor.rssi * (-1),
+ pIesLocal->Country.country[0],pIesLocal->Country.country[1] );
+ //Getting BSSID for best AP in scan result.
+ palCopyMemory(pMac->hHdd, bssid_temp,
+ pBssDescription->Result.BssDescriptor.bssId, sizeof(tSirMacAddr));
+
}
}
}
+ //get current rssi for BSS from which country code is acquired.
+ if ( csrIs11dSupported(pMac) && (csrIsMacAddressEqual(pMac,
+ &pMac->scan.currentCountryBssid,
+ &pBssDescription->Result.BssDescriptor.bssId) ))
+ {
+ smsLog(pMac, LOGW, FL("Information about current country Bssid "
+ MAC_ADDRESS_STR
+ " chan= %d, rssi = -%d, countryCode %c%c"),
+ MAC_ADDR_ARRAY( pBssDescription->Result.BssDescriptor.bssId),
+ pBssDescription->Result.BssDescriptor.channelId,
+ pBssDescription->Result.BssDescriptor.rssi * (-1),
+ pIesLocal->Country.country[0],pIesLocal->Country.country[1] );
+ rssi_of_current_country = pBssDescription->Result.BssDescriptor.rssi ;
+ }
+
// append to main list
csrScanAddResult(pMac, pBssDescription, pIesLocal);
- if( (pBssDescription->Result.pvIes == NULL) && pIesLocal )
+ if ( (pBssDescription->Result.pvIes == NULL) && pIesLocal )
{
palFreeMemory(pMac->hHdd, pIesLocal);
}
}
+ // Calculating 30% of current rssi is an idea for not to change
+ // country code so freq.
+ if (rssi_of_current_country != -128)
+ {
+ rssi_of_current_country = rssi_of_current_country
+ - THIRTY_PERCENT(rssi_of_current_country);
+ }
+
+ if ((rssi_of_current_country <= cand_Bss_rssi ) || rssi_of_current_country == -128)
+ {
+ csrLLLock(&pMac->scan.scanResultList);
+ pEntryTemp = csrLLPeekHead(&pMac->scan.scanResultList, LL_ACCESS_NOLOCK);
+ while ( NULL != pEntryTemp)
+ {
+ pNext = csrLLNext(&pMac->scan.scanResultList, pEntryTemp,
+ LL_ACCESS_NOLOCK);
+ pBssDescription = GET_BASE_ADDR( pEntryTemp, tCsrScanResult, Link );
+ pIesLocal = (tDot11fBeaconIEs *)( pBssDescription->Result.pvIes );
+ // Need to traverse whole scan list to get description for best 11d AP.
+ if (csrIsMacAddressEqual(pMac, (tCsrBssid *)&bssid_temp,
+ (tCsrBssid *) pBssDescription->Result.BssDescriptor.bssId))
+ {
+ palCopyMemory(pMac->hHdd, pMac->scan.currentCountryBssid,
+ bssid_temp, sizeof(tSirMacAddr));
+ // Best AP should be passed to update reg domain.
+ csrLearnCountryInformation( pMac, &pBssDescription->Result.BssDescriptor,
+ pIesLocal, eANI_BOOLEAN_FALSE );
+ break;
+ }
+ pEntryTemp = pNext;
+ }
+ csrLLUnlock(&pMac->scan.scanResultList);
+ }
+
+
//Tush: If we can find the current 11d info in any of the scan results, or
// a good enough AP with the 11d info from the scan results then no need to
// get into ambiguous state