samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Rename assocReq

Browse Source 
Linux coding style doesn't allow camel case notations. So
rename assocReq to be in compliance.

Change-Id: I82e608da9548ac9413f9ecb025e5b662c9f555be
CRs-Fixed: 2480902
This commit is contained in:
Pragaspathi Thilagaraj
2019-06-22 13:07:04 +05:30
committed by nshrivas
parent 837faee786
commit f812ccf55a
6 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/mac/src/pe/include/lim_session.h
View File

@@ -226,7 +226,7 @@ struct pe_session {
uint8_t *beacon; /* Used to store last beacon / probe response before assoc. */ uint8_t *beacon; /* Used to store last beacon / probe response before assoc. */
uint32_t assocReqLen; uint32_t assocReqLen;
uint8_t *assocReq; /* Used to store association request frame sent out while associating. */ uint8_t *assoc_req; /* Used to store association request frame */
uint32_t assocRspLen; uint32_t assocRspLen;
uint8_t *assocRsp; /* Used to store association response received while associating */ uint8_t *assocRsp; /* Used to store association response received while associating */

2
core/mac/src/pe/lim/lim_process_mlm_req_messages.c
View File

@@ -914,7 +914,7 @@ static void lim_process_mlm_assoc_req(struct mac_context *mac_ctx, uint32_t *msg
end: end:
/* Update PE session Id */ /* Update PE session Id */
mlm_assoc_cnf.sessionId = mlm_assoc_req->sessionId; mlm_assoc_cnf.sessionId = mlm_assoc_req->sessionId;
/* Free up buffer allocated for assocReq */ /* Free up buffer allocated for assoc_req */
qdf_mem_free(mlm_assoc_req); qdf_mem_free(mlm_assoc_req);
lim_post_sme_message(mac_ctx, LIM_MLM_ASSOC_CNF, lim_post_sme_message(mac_ctx, LIM_MLM_ASSOC_CNF,
(uint32_t *) &mlm_assoc_cnf); (uint32_t *) &mlm_assoc_cnf);

39
core/mac/src/pe/lim/lim_send_frames_host_roam.c
View File

@@ -370,9 +370,9 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(struct mac_context *mac_ctx,
pe_debug("*** Sending Re-Assoc Request length: %d %d to", pe_debug("*** Sending Re-Assoc Request length: %d %d to",
bytes, payload); bytes, payload);
if (pe_session->assocReq) { if (pe_session->assoc_req) {
qdf_mem_free(pe_session->assocReq); qdf_mem_free(pe_session->assoc_req);
pe_session->assocReq = NULL; pe_session->assoc_req = NULL;
pe_session->assocReqLen = 0; pe_session->assocReqLen = 0;
} }
@@ -382,13 +382,13 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(struct mac_context *mac_ctx,
payload += add_ie_len; payload += add_ie_len;
} }
pe_session->assocReq = qdf_mem_malloc(payload); pe_session->assoc_req = qdf_mem_malloc(payload);
if (pe_session->assocReq) { if (pe_session->assoc_req) {
/* /*
* Store the Assoc request. This is sent to csr/hdd in * Store the Assoc request. This is sent to csr/hdd in
* join cnf response. * join cnf response.
*/ */
qdf_mem_copy(pe_session->assocReq, qdf_mem_copy(pe_session->assoc_req,
frame + sizeof(tSirMacMgmtHdr), payload); frame + sizeof(tSirMacMgmtHdr), payload);
pe_session->assocReqLen = payload; pe_session->assocReqLen = payload;
} }
@@ -416,22 +416,23 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(struct mac_context *mac_ctx,
pe_session->opmode == QDF_P2P_GO_MODE) pe_session->opmode == QDF_P2P_GO_MODE)
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
if (pe_session->assocReq) { if (pe_session->assoc_req) {
qdf_mem_free(pe_session->assocReq); qdf_mem_free(pe_session->assoc_req);
pe_session->assocReq = NULL; pe_session->assoc_req = NULL;
pe_session->assocReqLen = 0; pe_session->assocReqLen = 0;
} }
if (ft_ies_length) { if (ft_ies_length) {
pe_session->assocReq = qdf_mem_malloc(ft_ies_length); pe_session->assoc_req = qdf_mem_malloc(ft_ies_length);
if (!pe_session->assocReq) { if (!pe_session->assoc_req) {
pe_session->assocReqLen = 0; pe_session->assocReqLen = 0;
} else { } else {
/* /*
* Store the FT IEs. This is sent to csr/hdd in * Store the FT IEs. This is sent to csr/hdd in
* join cnf response. * join cnf response.
*/ */
qdf_mem_copy(pe_session->assocReq, qdf_mem_copy(pe_session->assoc_req,
ft_sme_context->reassoc_ft_ies, ft_ies_length); ft_sme_context->reassoc_ft_ies,
ft_ies_length);
pe_session->assocReqLen = ft_ies_length; pe_session->assocReqLen = ft_ies_length;
} }
} else { } else {
@@ -741,9 +742,9 @@ void lim_send_reassoc_req_mgmt_frame(struct mac_context *mac,
pe_debug("*** Sending Re-Association Request length: %d" "to", nBytes); pe_debug("*** Sending Re-Association Request length: %d" "to", nBytes);
if (pe_session->assocReq) { if (pe_session->assoc_req) {
qdf_mem_free(pe_session->assocReq); qdf_mem_free(pe_session->assoc_req);
pe_session->assocReq = NULL; pe_session->assoc_req = NULL;
pe_session->assocReqLen = 0; pe_session->assocReqLen = 0;
} }
@@ -753,10 +754,10 @@ void lim_send_reassoc_req_mgmt_frame(struct mac_context *mac,
nPayload += nAddIELen; nPayload += nAddIELen;
} }
pe_session->assocReq = qdf_mem_malloc(nPayload); pe_session->assoc_req = qdf_mem_malloc(nPayload);
if (pe_session->assocReq) { if (pe_session->assoc_req) {
/* Store the Assocrequest. It is sent to csr in joincnfrsp */ /* Store the Assocrequest. It is sent to csr in joincnfrsp */
qdf_mem_copy(pe_session->assocReq, qdf_mem_copy(pe_session->assoc_req,
pFrame + sizeof(tSirMacMgmtHdr), nPayload); pFrame + sizeof(tSirMacMgmtHdr), nPayload);
pe_session->assocReqLen = nPayload; pe_session->assocReqLen = nPayload;
} }

14
core/mac/src/pe/lim/lim_send_management_frames.c
View File

@@ -1205,7 +1205,7 @@ lim_send_assoc_rsp_mgmt_frame(
assoc_req = (tpSirAssocReq) assoc_req = (tpSirAssocReq)
pe_session->parsedAssocReq[sta->assocId]; pe_session->parsedAssocReq[sta->assocId];
/* /*
* populate P2P IE in AssocRsp when assocReq from the peer * populate P2P IE in AssocRsp when assoc_req from the peer
* includes P2P IE * includes P2P IE
*/ */
if (assoc_req && assoc_req->addIEPresent) if (assoc_req && assoc_req->addIEPresent)
@@ -2283,9 +2283,9 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
adaptive_11r_ie, adaptive_11r_ie_len); adaptive_11r_ie, adaptive_11r_ie_len);
payload = payload + adaptive_11r_ie_len; payload = payload + adaptive_11r_ie_len;
if (pe_session->assocReq) { if (pe_session->assoc_req) {
qdf_mem_free(pe_session->assocReq); qdf_mem_free(pe_session->assoc_req);
pe_session->assocReq = NULL; pe_session->assoc_req = NULL;
pe_session->assocReqLen = 0; pe_session->assocReqLen = 0;
} }
@@ -2298,13 +2298,13 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
} }
} }
pe_session->assocReq = qdf_mem_malloc(payload); pe_session->assoc_req = qdf_mem_malloc(payload);
if (pe_session->assocReq) { if (pe_session->assoc_req) {
/* /*
* Store the Assoc request. This is sent to csr/hdd in * Store the Assoc request. This is sent to csr/hdd in
* join cnf response. * join cnf response.
*/ */
qdf_mem_copy(pe_session->assocReq, qdf_mem_copy(pe_session->assoc_req,
frame + sizeof(tSirMacMgmtHdr), payload); frame + sizeof(tSirMacMgmtHdr), payload);
pe_session->assocReqLen = payload; pe_session->assocReqLen = payload;
} }

14
core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
View File

@@ -203,15 +203,15 @@ static void lim_handle_join_rsp_status(struct mac_context *mac_ctx,
sme_join_rsp->beaconLength); sme_join_rsp->beaconLength);
} }
if (session_entry->assocReq) { if (session_entry->assoc_req) {
sme_join_rsp->assocReqLength = sme_join_rsp->assocReqLength =
session_entry->assocReqLen; session_entry->assocReqLen;
qdf_mem_copy(sme_join_rsp->frames + qdf_mem_copy(sme_join_rsp->frames +
sme_join_rsp->beaconLength, sme_join_rsp->beaconLength,
session_entry->assocReq, session_entry->assoc_req,
sme_join_rsp->assocReqLength); sme_join_rsp->assocReqLength);
qdf_mem_free(session_entry->assocReq); qdf_mem_free(session_entry->assoc_req);
session_entry->assocReq = NULL; session_entry->assoc_req = NULL;
session_entry->assocReqLen = 0; session_entry->assocReqLen = 0;
pe_debug("AssocReq: %d", pe_debug("AssocReq: %d",
sme_join_rsp->assocReqLength); sme_join_rsp->assocReqLength);
@@ -325,9 +325,9 @@ static void lim_handle_join_rsp_status(struct mac_context *mac_ctx,
session_entry->beacon = NULL; session_entry->beacon = NULL;
session_entry->bcnLen = 0; session_entry->bcnLen = 0;
} }
if (session_entry->assocReq) { if (session_entry->assoc_req) {
qdf_mem_free(session_entry->assocReq); qdf_mem_free(session_entry->assoc_req);
session_entry->assocReq = NULL; session_entry->assoc_req = NULL;
session_entry->assocReqLen = 0; session_entry->assocReqLen = 0;
} }
if (session_entry->assocRsp) { if (session_entry->assocRsp) {

6
core/mac/src/pe/lim/lim_session.c
View File

@@ -883,9 +883,9 @@ void pe_delete_session(struct mac_context *mac_ctx, struct pe_session *session)
session->bcnLen = 0; session->bcnLen = 0;
} }
if (session->assocReq) { if (session->assoc_req) {
qdf_mem_free(session->assocReq); qdf_mem_free(session->assoc_req);
session->assocReq = NULL; session->assoc_req = NULL;
session->assocReqLen = 0; session->assocReqLen = 0;
} }