qcacld-3.0: Rename assocReq
Linux coding style doesn't allow camel case notations. So
rename assocReq to be in compliance.
Change-Id: I82e608da9548ac9413f9ecb025e5b662c9f555be
CRs-Fixed: 2480902
diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h
index 2f7f8f4..b9c59be 100644
--- a/core/mac/src/pe/include/lim_session.h
+++ b/core/mac/src/pe/include/lim_session.h
@@ -226,7 +226,7 @@
uint8_t *beacon; /* Used to store last beacon / probe response before assoc. */
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;
uint8_t *assocRsp; /* Used to store association response received while associating */
diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
index 0324f48..37725ad 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
@@ -914,7 +914,7 @@
end:
/* Update PE session Id */
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);
lim_post_sme_message(mac_ctx, LIM_MLM_ASSOC_CNF,
(uint32_t *) &mlm_assoc_cnf);
diff --git a/core/mac/src/pe/lim/lim_send_frames_host_roam.c b/core/mac/src/pe/lim/lim_send_frames_host_roam.c
index 0c1607d..ae34978 100644
--- a/core/mac/src/pe/lim/lim_send_frames_host_roam.c
+++ b/core/mac/src/pe/lim/lim_send_frames_host_roam.c
@@ -370,9 +370,9 @@
pe_debug("*** Sending Re-Assoc Request length: %d %d to",
bytes, payload);
- if (pe_session->assocReq) {
- qdf_mem_free(pe_session->assocReq);
- pe_session->assocReq = NULL;
+ if (pe_session->assoc_req) {
+ qdf_mem_free(pe_session->assoc_req);
+ pe_session->assoc_req = NULL;
pe_session->assocReqLen = 0;
}
@@ -382,13 +382,13 @@
payload += add_ie_len;
}
- pe_session->assocReq = qdf_mem_malloc(payload);
- if (pe_session->assocReq) {
+ pe_session->assoc_req = qdf_mem_malloc(payload);
+ if (pe_session->assoc_req) {
/*
* Store the Assoc request. This is sent to csr/hdd in
* join cnf response.
*/
- qdf_mem_copy(pe_session->assocReq,
+ qdf_mem_copy(pe_session->assoc_req,
frame + sizeof(tSirMacMgmtHdr), payload);
pe_session->assocReqLen = payload;
}
@@ -416,22 +416,23 @@
pe_session->opmode == QDF_P2P_GO_MODE)
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
- if (pe_session->assocReq) {
- qdf_mem_free(pe_session->assocReq);
- pe_session->assocReq = NULL;
+ if (pe_session->assoc_req) {
+ qdf_mem_free(pe_session->assoc_req);
+ pe_session->assoc_req = NULL;
pe_session->assocReqLen = 0;
}
if (ft_ies_length) {
- pe_session->assocReq = qdf_mem_malloc(ft_ies_length);
- if (!pe_session->assocReq) {
+ pe_session->assoc_req = qdf_mem_malloc(ft_ies_length);
+ if (!pe_session->assoc_req) {
pe_session->assocReqLen = 0;
} else {
/*
* Store the FT IEs. This is sent to csr/hdd in
* join cnf response.
*/
- qdf_mem_copy(pe_session->assocReq,
- ft_sme_context->reassoc_ft_ies, ft_ies_length);
+ qdf_mem_copy(pe_session->assoc_req,
+ ft_sme_context->reassoc_ft_ies,
+ ft_ies_length);
pe_session->assocReqLen = ft_ies_length;
}
} else {
@@ -741,9 +742,9 @@
pe_debug("*** Sending Re-Association Request length: %d" "to", nBytes);
- if (pe_session->assocReq) {
- qdf_mem_free(pe_session->assocReq);
- pe_session->assocReq = NULL;
+ if (pe_session->assoc_req) {
+ qdf_mem_free(pe_session->assoc_req);
+ pe_session->assoc_req = NULL;
pe_session->assocReqLen = 0;
}
@@ -753,10 +754,10 @@
nPayload += nAddIELen;
}
- pe_session->assocReq = qdf_mem_malloc(nPayload);
- if (pe_session->assocReq) {
+ pe_session->assoc_req = qdf_mem_malloc(nPayload);
+ if (pe_session->assoc_req) {
/* 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);
pe_session->assocReqLen = nPayload;
}
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index 9ac12f2..de1a13b 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -1205,7 +1205,7 @@
assoc_req = (tpSirAssocReq)
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
*/
if (assoc_req && assoc_req->addIEPresent)
@@ -2283,9 +2283,9 @@
adaptive_11r_ie, adaptive_11r_ie_len);
payload = payload + adaptive_11r_ie_len;
- if (pe_session->assocReq) {
- qdf_mem_free(pe_session->assocReq);
- pe_session->assocReq = NULL;
+ if (pe_session->assoc_req) {
+ qdf_mem_free(pe_session->assoc_req);
+ pe_session->assoc_req = NULL;
pe_session->assocReqLen = 0;
}
@@ -2298,13 +2298,13 @@
}
}
- pe_session->assocReq = qdf_mem_malloc(payload);
- if (pe_session->assocReq) {
+ pe_session->assoc_req = qdf_mem_malloc(payload);
+ if (pe_session->assoc_req) {
/*
* Store the Assoc request. This is sent to csr/hdd in
* join cnf response.
*/
- qdf_mem_copy(pe_session->assocReq,
+ qdf_mem_copy(pe_session->assoc_req,
frame + sizeof(tSirMacMgmtHdr), payload);
pe_session->assocReqLen = payload;
}
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index 95bcbcd..26056eb 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -203,15 +203,15 @@
sme_join_rsp->beaconLength);
}
- if (session_entry->assocReq) {
+ if (session_entry->assoc_req) {
sme_join_rsp->assocReqLength =
session_entry->assocReqLen;
qdf_mem_copy(sme_join_rsp->frames +
sme_join_rsp->beaconLength,
- session_entry->assocReq,
+ session_entry->assoc_req,
sme_join_rsp->assocReqLength);
- qdf_mem_free(session_entry->assocReq);
- session_entry->assocReq = NULL;
+ qdf_mem_free(session_entry->assoc_req);
+ session_entry->assoc_req = NULL;
session_entry->assocReqLen = 0;
pe_debug("AssocReq: %d",
sme_join_rsp->assocReqLength);
@@ -325,9 +325,9 @@
session_entry->beacon = NULL;
session_entry->bcnLen = 0;
}
- if (session_entry->assocReq) {
- qdf_mem_free(session_entry->assocReq);
- session_entry->assocReq = NULL;
+ if (session_entry->assoc_req) {
+ qdf_mem_free(session_entry->assoc_req);
+ session_entry->assoc_req = NULL;
session_entry->assocReqLen = 0;
}
if (session_entry->assocRsp) {
diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c
index 3a80800..93200f7 100644
--- a/core/mac/src/pe/lim/lim_session.c
+++ b/core/mac/src/pe/lim/lim_session.c
@@ -883,9 +883,9 @@
session->bcnLen = 0;
}
- if (session->assocReq) {
- qdf_mem_free(session->assocReq);
- session->assocReq = NULL;
+ if (session->assoc_req) {
+ qdf_mem_free(session->assoc_req);
+ session->assoc_req = NULL;
session->assocReqLen = 0;
}