mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-14 16:46:15 -04:00
qcacld-3.0: Cleanup unused legacy crypto api of csr
Cleanup unused legacy crypto api of csr. Change-Id: I68cd35d8a72fbea675a34d9894563bf83e1fed8a CRs-Fixed: 2583679
This commit is contained in:
parent
2b0c18bde9
commit
4f134e2ff7
4 changed files with 224 additions and 910 deletions
|
|
@ -259,8 +259,6 @@ bool csr_is_ibss_bss_desc(struct bss_description *pSirBssDesc)
|
|||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
bool csr_is_privacy(struct bss_description *pSirBssDesc);
|
||||
tSirResultCodes csr_get_de_auth_rsp_status_code(struct deauth_rsp *pSmeRsp);
|
||||
uint32_t csr_get_frag_thresh(struct mac_context *mac_ctx);
|
||||
uint32_t csr_get_rts_thresh(struct mac_context *mac_ctx);
|
||||
|
|
@ -322,16 +320,6 @@ bool csr_rates_is_dot11_rate11b_supported_rate(uint8_t dot11Rate);
|
|||
bool csr_rates_is_dot11_rate11a_supported_rate(uint8_t dot11Rate);
|
||||
tAniEdType csr_translate_encrypt_type_to_ed_type(
|
||||
eCsrEncryptionType EncryptType);
|
||||
/*
|
||||
* pIes shall contain IEs from pSirBssDesc.
|
||||
* It shall be returned from function csr_get_parsed_bss_description_ies
|
||||
*/
|
||||
bool csr_is_security_match(struct mac_context *mac_ctx, tCsrAuthList *auth_type,
|
||||
tCsrEncryptionList *uc_enc_type,
|
||||
tCsrEncryptionList *mc_enc_type, bool *mfp_enabled,
|
||||
uint8_t *mfp_required, uint8_t *mfp_capable,
|
||||
struct bss_description *bss_desc,
|
||||
tDot11fBeaconIEs *ies_ptr, uint8_t session_id);
|
||||
|
||||
bool csr_is_bssid_match(struct qdf_mac_addr *pProfBssid,
|
||||
struct qdf_mac_addr *BssBssid);
|
||||
|
|
|
|||
|
|
@ -922,11 +922,6 @@ QDF_STATUS csr_dequeue_roam_command(struct mac_context *mac,
|
|||
enum csr_roam_reason reason,
|
||||
uint8_t session_id);
|
||||
void csr_init_occupied_channels_list(struct mac_context *mac, uint8_t sessionId);
|
||||
bool csr_neighbor_roam_connected_profile_match(struct mac_context *mac,
|
||||
uint8_t sessionId,
|
||||
struct tag_csrscan_result
|
||||
*pResult,
|
||||
tDot11fBeaconIEs *pIes);
|
||||
|
||||
QDF_STATUS csr_scan_create_entry_in_scan_cache(struct mac_context *mac,
|
||||
uint32_t sessionId,
|
||||
|
|
|
|||
|
|
@ -587,101 +587,6 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(struct mac_context *mac,
|
|||
return QDF_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* csr_neighbor_roam_is_ssid_and_security_match() - to match ssid/security
|
||||
* @mac: Pointer to mac context
|
||||
* @pCurProfile: pointer to current roam profile
|
||||
* @bss_desc: pointer to bss description
|
||||
* @pIes: pointer to local ies
|
||||
* @session_id: Session ID
|
||||
*
|
||||
* This routine will be called to see if SSID and security parameters
|
||||
* are matching.
|
||||
*
|
||||
* Return: bool
|
||||
*/
|
||||
static bool csr_neighbor_roam_is_ssid_and_security_match(struct mac_context *mac,
|
||||
tCsrRoamConnectedProfile *pCurProfile,
|
||||
struct bss_description *bss_desc, tDot11fBeaconIEs *pIes,
|
||||
uint8_t session_id)
|
||||
{
|
||||
tCsrAuthList authType;
|
||||
tCsrEncryptionList uCEncryptionType;
|
||||
tCsrEncryptionList mCEncryptionType;
|
||||
bool fMatch = false;
|
||||
|
||||
authType.numEntries = 1;
|
||||
authType.authType[0] = pCurProfile->AuthType;
|
||||
uCEncryptionType.numEntries = 1;
|
||||
uCEncryptionType.encryptionType[0] = pCurProfile->EncryptionType;
|
||||
mCEncryptionType.numEntries = 1;
|
||||
mCEncryptionType.encryptionType[0] = pCurProfile->mcEncryptionType;
|
||||
|
||||
/* Again, treat missing pIes as a non-match. */
|
||||
if (!pIes)
|
||||
return false;
|
||||
|
||||
/* Treat a missing SSID as a non-match. */
|
||||
if (!pIes->SSID.present)
|
||||
return false;
|
||||
|
||||
fMatch = csr_is_ssid_match(mac,
|
||||
(void *)pCurProfile->SSID.ssId,
|
||||
pCurProfile->SSID.length,
|
||||
pIes->SSID.ssid,
|
||||
pIes->SSID.num_ssid, true);
|
||||
if (true == fMatch) {
|
||||
#ifdef WLAN_FEATURE_11W
|
||||
/*
|
||||
* We are sending current connected APs profile setting
|
||||
* if other AP doesn't have the same PMF setting as currently
|
||||
* connected AP then we will have some issues in roaming.
|
||||
*
|
||||
* Make sure all the APs have same PMF settings to avoid
|
||||
* any corner cases.
|
||||
*/
|
||||
fMatch = csr_is_security_match(mac, &authType,
|
||||
&uCEncryptionType, &mCEncryptionType,
|
||||
&pCurProfile->MFPEnabled,
|
||||
&pCurProfile->MFPRequired,
|
||||
&pCurProfile->MFPCapable,
|
||||
bss_desc, pIes, session_id);
|
||||
#else
|
||||
fMatch = csr_is_security_match(mac, &authType,
|
||||
&uCEncryptionType,
|
||||
&mCEncryptionType, NULL,
|
||||
NULL, NULL, bss_desc,
|
||||
pIes, session_id);
|
||||
#endif
|
||||
return fMatch;
|
||||
} else {
|
||||
return fMatch;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
bool csr_neighbor_roam_connected_profile_match(struct mac_context *mac,
|
||||
uint8_t sessionId,
|
||||
struct tag_csrscan_result
|
||||
*pResult,
|
||||
tDot11fBeaconIEs *pIes)
|
||||
{
|
||||
tCsrRoamConnectedProfile *pCurProfile = NULL;
|
||||
struct bss_description *bss_desc = &pResult->Result.BssDescriptor;
|
||||
|
||||
if (!(mac->roam.roamSession && CSR_IS_SESSION_VALID(mac, sessionId)))
|
||||
return false;
|
||||
|
||||
pCurProfile = &mac->roam.roamSession[sessionId].connectedProfile;
|
||||
|
||||
if (!pCurProfile)
|
||||
return false;
|
||||
|
||||
return csr_neighbor_roam_is_ssid_and_security_match(mac, pCurProfile,
|
||||
bss_desc, pIes,
|
||||
sessionId);
|
||||
}
|
||||
|
||||
/**
|
||||
* csr_roam_reset_roam_params - API to reset the roaming parameters
|
||||
* @mac_ctx: Pointer to the global MAC structure
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue