Forráskód Böngészése

qcacld-3.0: Remove transactionId from join_req

The transactionId in struct join_req is unused, so remove it.

Change-Id: I6117190ae0cf486763fd9636a5682553cf5f8970
CRs-Fixed: 2403177
Jeff Johnson 6 éve
szülő
commit
f6601c3858

+ 0 - 6
core/mac/inc/sir_api.h

@@ -891,16 +891,10 @@ struct plm_req {
 
 /* / Definition for join request */
 /* / ---> MAC */
-/* / WARNING! If you add a field in JOIN REQ. */
-/* /         Make sure to add it in REASSOC REQ */
-/* / The Serdes function is the same and its */
-/* / shared with REASSOC. So if we add a field */
-/*  here and dont add it in REASSOC REQ. It will BREAK!!! REASSOC. */
 struct join_req {
 	uint16_t messageType;   /* eWNI_SME_JOIN_REQ */
 	uint16_t length;
 	uint8_t sessionId;
-	uint16_t transactionId;
 	tSirMacSSid ssId;
 	tSirMacAddr selfMacAddr;        /* self Mac address */
 	tSirBssType bsstype;    /* add new type for BT-AMP STA and AP Modules */

+ 0 - 8
core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -1198,7 +1198,6 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 	uint8_t session_id;
 	struct pe_session *session = NULL;
 	uint8_t sme_session_id = 0;
-	uint16_t sme_transaction_id = 0;
 	int8_t local_power_constraint = 0, reg_max = 0;
 	uint16_t ie_len;
 	const uint8_t *vendor_ie;
@@ -1315,9 +1314,6 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 		/* store the smejoin req handle in session table */
 		session->pLimJoinReq = sme_join_req;
 
-		/* Store SME transaction Id in session Table */
-		session->transactionId = sme_join_req->transactionId;
-
 		/* Store beaconInterval */
 		session->beaconParams.beaconInterval =
 			bss_desc->beaconInterval;
@@ -1652,7 +1648,6 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 
 end:
 	sme_session_id = in_req->sessionId;
-	sme_transaction_id = in_req->transactionId;
 
 	if (sme_join_req) {
 		qdf_mem_free(sme_join_req);
@@ -1713,13 +1708,11 @@ static void __lim_process_sme_reassoc_req(struct mac_context *mac_ctx,
 	struct pe_session *session_entry = NULL;
 	uint8_t session_id;
 	uint8_t sme_session_id;
-	uint16_t transaction_id;
 	int8_t local_pwr_constraint = 0, reg_max = 0;
 	uint32_t tele_bcn_en = 0;
 	QDF_STATUS status;
 
 	sme_session_id = in_req->sessionId;
-	transaction_id = in_req->transactionId;
 
 	reassoc_req = qdf_mem_malloc(in_req->length);
 	if (!reassoc_req) {
@@ -1829,7 +1822,6 @@ static void __lim_process_sme_reassoc_req(struct mac_context *mac_ctx,
 			}
 
 			session_entry->smeSessionId = sme_session_id;
-			session_entry->transactionId = transaction_id;
 			mlm_reassoc_req =
 				qdf_mem_malloc(sizeof(*mlm_reassoc_req));
 			if (!mlm_reassoc_req) {

+ 0 - 1
core/sme/src/csr/csr_api_roam.c

@@ -14668,7 +14668,6 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 		csr_join_req->messageType = messageType;
 		csr_join_req->length = msgLen;
 		csr_join_req->sessionId = (uint8_t) sessionId;
-		csr_join_req->transactionId = 0;
 		if (pIes->SSID.present &&
 		    !csr_is_nullssid(pIes->SSID.ssid,
 				     pIes->SSID.num_ssid)) {