|
@@ -3538,30 +3538,53 @@ static QDF_STATUS csr_prepare_scan_filter(tpAniSirGlobal mac_ctx,
|
|
|
pFilter->fils_realm, REAM_HASH_LEN);
|
|
|
}
|
|
|
|
|
|
- filter->num_of_auth =
|
|
|
- pFilter->authType.numEntries;
|
|
|
- if (filter->num_of_auth > WLAN_NUM_OF_SUPPORT_AUTH_TYPE)
|
|
|
- filter->num_of_auth = WLAN_NUM_OF_SUPPORT_AUTH_TYPE;
|
|
|
- for (i = 0; i < filter->num_of_auth; i++)
|
|
|
- filter->auth_type[i] =
|
|
|
- csr_covert_auth_type_new(pFilter->authType.authType[i]);
|
|
|
- filter->num_of_enc_type =
|
|
|
- pFilter->EncryptionType.numEntries;
|
|
|
- if (filter->num_of_enc_type > WLAN_NUM_OF_ENCRYPT_TYPE)
|
|
|
- filter->num_of_enc_type = WLAN_NUM_OF_ENCRYPT_TYPE;
|
|
|
- for (i = 0; i < filter->num_of_enc_type; i++)
|
|
|
- filter->enc_type[i] =
|
|
|
- csr_covert_enc_type_new(
|
|
|
- pFilter->EncryptionType.encryptionType[i]);
|
|
|
- filter->num_of_mc_enc_type =
|
|
|
- pFilter->mcEncryptionType.numEntries;
|
|
|
- if (filter->num_of_mc_enc_type > WLAN_NUM_OF_ENCRYPT_TYPE)
|
|
|
- filter->num_of_mc_enc_type = WLAN_NUM_OF_ENCRYPT_TYPE;
|
|
|
- for (i = 0; i < filter->num_of_mc_enc_type; i++)
|
|
|
- filter->mc_enc_type[i] =
|
|
|
- csr_covert_enc_type_new(
|
|
|
- pFilter->mcEncryptionType.encryptionType[i]);
|
|
|
+ if (pFilter->force_rsne_override) {
|
|
|
+ int idx;
|
|
|
|
|
|
+ sme_debug("force_rsne_override enabled fill all auth type and enctype");
|
|
|
+ filter->num_of_auth = WLAN_NUM_OF_SUPPORT_AUTH_TYPE;
|
|
|
+ for (i = 0; i < filter->num_of_auth; i++)
|
|
|
+ filter->auth_type[i] = i;
|
|
|
+
|
|
|
+ idx = 0;
|
|
|
+ for (i = 0; i < WLAN_NUM_OF_ENCRYPT_TYPE; i++) {
|
|
|
+ if (i == WLAN_ENCRYPT_TYPE_TKIP ||
|
|
|
+ i == WLAN_ENCRYPT_TYPE_AES ||
|
|
|
+ i == WLAN_ENCRYPT_TYPE_AES_GCMP ||
|
|
|
+ i == WLAN_ENCRYPT_TYPE_AES_GCMP_256) {
|
|
|
+ filter->enc_type[idx] = i;
|
|
|
+ filter->mc_enc_type[idx] = i;
|
|
|
+ idx++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ filter->num_of_enc_type = idx;
|
|
|
+ filter->num_of_mc_enc_type = idx;
|
|
|
+ } else {
|
|
|
+ filter->num_of_auth =
|
|
|
+ pFilter->authType.numEntries;
|
|
|
+ if (filter->num_of_auth > WLAN_NUM_OF_SUPPORT_AUTH_TYPE)
|
|
|
+ filter->num_of_auth = WLAN_NUM_OF_SUPPORT_AUTH_TYPE;
|
|
|
+ for (i = 0; i < filter->num_of_auth; i++)
|
|
|
+ filter->auth_type[i] =
|
|
|
+ csr_covert_auth_type_new(
|
|
|
+ pFilter->authType.authType[i]);
|
|
|
+ filter->num_of_enc_type =
|
|
|
+ pFilter->EncryptionType.numEntries;
|
|
|
+ if (filter->num_of_enc_type > WLAN_NUM_OF_ENCRYPT_TYPE)
|
|
|
+ filter->num_of_enc_type = WLAN_NUM_OF_ENCRYPT_TYPE;
|
|
|
+ for (i = 0; i < filter->num_of_enc_type; i++)
|
|
|
+ filter->enc_type[i] =
|
|
|
+ csr_covert_enc_type_new(
|
|
|
+ pFilter->EncryptionType.encryptionType[i]);
|
|
|
+ filter->num_of_mc_enc_type =
|
|
|
+ pFilter->mcEncryptionType.numEntries;
|
|
|
+ if (filter->num_of_mc_enc_type > WLAN_NUM_OF_ENCRYPT_TYPE)
|
|
|
+ filter->num_of_mc_enc_type = WLAN_NUM_OF_ENCRYPT_TYPE;
|
|
|
+ for (i = 0; i < filter->num_of_mc_enc_type; i++)
|
|
|
+ filter->mc_enc_type[i] =
|
|
|
+ csr_covert_enc_type_new(
|
|
|
+ pFilter->mcEncryptionType.encryptionType[i]);
|
|
|
+ }
|
|
|
qdf_mem_copy(filter->country,
|
|
|
pFilter->countryCode, WNI_CFG_COUNTRY_CODE_LEN);
|
|
|
|