Merge "wlan: Prioritize the bssid_hint, if it fails try with other BSS" into wlan-driver.lnx.1.0-dev.1.0
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index c3b34a9..229c366 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -14005,7 +14005,6 @@
v_U32_t roamId;
tCsrRoamProfile *pRoamProfile;
eCsrAuthType RSNAuthType;
- const u8 *pValidBssid = NULL;
ENTER();
@@ -14053,31 +14052,39 @@
vos_mem_copy((void *)(pRoamProfile->SSIDs.SSIDList->SSID.ssId),
ssid, ssid_len);
+ vos_mem_zero(pRoamProfile->BSSIDs.bssid, WNI_CFG_BSSID_LEN);
+ vos_mem_zero(pRoamProfile->bssid_hint, WNI_CFG_BSSID_LEN);
+
if (bssid)
{
- pValidBssid = bssid;
- }
- else if (bssid_hint)
- {
- pValidBssid = bssid_hint;
- }
- if (pValidBssid)
- {
pRoamProfile->BSSIDs.numOfBSSIDs = 1;
- vos_mem_copy((void *)(pRoamProfile->BSSIDs.bssid), pValidBssid,
+ vos_mem_copy(pRoamProfile->BSSIDs.bssid, bssid,
WNI_CFG_BSSID_LEN);
/* Save BSSID in seperate variable as well, as RoamProfile
BSSID is getting zeroed out in the association process. And in
case of join failure we should send valid BSSID to supplicant
*/
- vos_mem_copy((void *)(pWextState->req_bssId), pValidBssid,
+ vos_mem_copy(pWextState->req_bssId, bssid,
WNI_CFG_BSSID_LEN);
+
}
- else
+ else if (bssid_hint)
{
- vos_mem_zero((void *)(pRoamProfile->BSSIDs.bssid),WNI_CFG_BSSID_LEN);
+ /* Store bssid_hint to use in the scan filter. */
+ vos_mem_copy(pRoamProfile->bssid_hint, bssid_hint,
+ WNI_CFG_BSSID_LEN);
+ /*
+ * Save BSSID in seperate variable as well, as RoamProfile
+ * BSSID is getting zeroed out in the association process. And in
+ * case of join failure we should send valid BSSID to supplicant
+ */
+ vos_mem_copy(pWextState->req_bssId, bssid_hint,
+ WNI_CFG_BSSID_LEN);
+ hddLog(LOG1, FL(" bssid_hint: "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pRoamProfile->bssid_hint));
}
+
hddLog(LOG1, FL("Connect to SSID: %s opertating Channel: %u"),
pRoamProfile->SSIDs.SSIDList->SSID.ssId, operatingChannel);
if ((IW_AUTH_WPA_VERSION_WPA == pWextState->wpaVersion) ||
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index a15dc91..60befd9 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1538,6 +1538,7 @@
pWextState->roamProfile.AuthType.numEntries = 1;
pWextState->roamProfile.AuthType.authType[0] = eCSR_AUTH_TYPE_OPEN_SYSTEM;
+ vos_mem_zero((pWextState->roamProfile.bssid_hint), WNI_CFG_BSSID_LEN);
#ifdef WLAN_FEATURE_11W
pWextState->roamProfile.MFPEnabled = eANI_BOOLEAN_FALSE;
pWextState->roamProfile.MFPRequired = 0;
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index f46c6e0..e92ff99 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -405,6 +405,7 @@
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
tANI_BOOLEAN isPERRoamScan;
#endif
+ tCsrBssid bssid_hint;
}tCsrScanResultFilter;
@@ -958,7 +959,7 @@
tCsrMobilityDomainInfo MDID;
#endif
tVOS_CON_MODE csrPersona;
-
+ tCsrBssid bssid_hint;
}tCsrRoamProfile;
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 88d297b..2f5f1b0 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -9572,6 +9572,8 @@
pScanFilter->MDID.mobilityDomain = pProfile->MDID.mobilityDomain;
}
#endif
+ vos_mem_copy(pScanFilter->bssid_hint,
+ pProfile->bssid_hint, VOS_MAC_ADDR_SIZE);
#ifdef WLAN_FEATURE_11W
// Management Frame Protection
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index a5a8b1a..d6ea857 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -2700,6 +2700,14 @@
LL_ACCESS_NOLOCK);
}
}
+ /* bssid hint AP should be on head */
+ else if (pFilter &&
+ vos_mem_compare(pResult->Result.BssDescriptor.bssId,
+ pFilter->bssid_hint, VOS_MAC_ADDR_SIZE))
+ {
+ csrLLInsertHead(&pRetList->List,
+ &pResult->Link, LL_ACCESS_NOLOCK);
+ }
else
{
//To sort the list
@@ -2710,6 +2718,14 @@
while(pTmpEntry)
{
pTmpResult = GET_BASE_ADDR( pTmpEntry, tCsrScanResult, Link );
+ /* Skip the bssid hint AP, as it should be on head */
+ if (pFilter &&
+ vos_mem_compare(pResult->Result.BssDescriptor.bssId,
+ pFilter->bssid_hint, VOS_MAC_ADDR_SIZE)) {
+ pTmpEntry = csrLLNext(&pRetList->List,
+ pTmpEntry, LL_ACCESS_NOLOCK);
+ continue;
+ }
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
if (pFilter && pFilter->isPERRoamScan) {
csrFindCongestionScore(pMac, pResult);