qcacld-3.0: Remove transactionId from tSirSmeRsp
The transactionId in struct tSirSmeRsp is unused, so remove it.
Change-Id: I9c4ba3433bf2e1e745c963dde0795348fb06c5d5
CRs-Fixed: 2403175
diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
index 10edde0..cb9cde6 100644
--- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
+++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
@@ -1393,8 +1393,7 @@
/* Delete PE session once BSS is deleted */
if (NULL != pe_session) {
lim_send_sme_rsp(mac, eWNI_SME_STOP_BSS_RSP, rc,
- pe_session->smeSessionId,
- pe_session->transactionId);
+ pe_session->smeSessionId);
pe_delete_session(mac, pe_session);
pe_session = NULL;
}
diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
index 0c23941..39ac6bf 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
@@ -1825,8 +1825,7 @@
pe_session->gLimNumOfCurrentSTAs = 0;
end:
lim_send_sme_rsp(mac, eWNI_SME_STOP_BSS_RSP, rc,
- pe_session->smeSessionId,
- pe_session->transactionId);
+ pe_session->smeSessionId);
pe_delete_session(mac, pe_session);
if (pDelBss != NULL) {
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 11865da..863b637 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -2740,8 +2740,7 @@
session->limSmeState));
lim_send_sme_rsp(mac_ctx, eWNI_SME_STOP_BSS_RSP,
- eSIR_SME_STOP_BSS_FAILURE, session->smeSessionId,
- session->transactionId);
+ eSIR_SME_STOP_BSS_FAILURE, session->smeSessionId);
}
void lim_delete_all_peers(struct pe_session *session)
@@ -2858,8 +2857,7 @@
pe_warn("received invalid SME_STOP_BSS_REQ message");
/* Send Stop BSS response to host */
lim_send_sme_rsp(mac, eWNI_SME_STOP_BSS_RSP,
- eSIR_SME_INVALID_PARAMETERS, smesessionId,
- smetransactionId);
+ eSIR_SME_INVALID_PARAMETERS, smesessionId);
return;
}
@@ -2869,8 +2867,7 @@
if (pe_session == NULL) {
pe_err("session does not exist for given BSSID");
lim_send_sme_rsp(mac, eWNI_SME_STOP_BSS_RSP,
- eSIR_SME_INVALID_PARAMETERS, smesessionId,
- smetransactionId);
+ eSIR_SME_INVALID_PARAMETERS, smesessionId);
return;
}
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */
@@ -2891,8 +2888,8 @@
lim_print_sme_state(mac, LOGE, pe_session->limSmeState);
/* / Send Stop BSS response to host */
lim_send_sme_rsp(mac, eWNI_SME_STOP_BSS_RSP,
- eSIR_SME_UNEXPECTED_REQ_RESULT_CODE, smesessionId,
- smetransactionId);
+ eSIR_SME_UNEXPECTED_REQ_RESULT_CODE,
+ smesessionId);
return;
}
@@ -2991,8 +2988,7 @@
dph_hash_table_init(mac, &pe_session->dph.dphHashTable);
lim_delete_pre_auth_list(mac);
lim_send_sme_rsp(mac, eWNI_SME_STOP_BSS_RSP, eSIR_SME_SUCCESS,
- pe_session->smeSessionId,
- pe_session->transactionId);
+ pe_session->smeSessionId);
return;
}
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 579b27d..1902c67 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
@@ -56,25 +56,8 @@
#include "lim_process_fils.h"
#include "wma.h"
-/**
- * lim_send_sme_rsp() - Send Response to upper layers
- * @mac_ctx: Pointer to Global MAC structure
- * @msg_type: Indicates message type
- * @result_code: Indicates the result of previously issued
- * eWNI_SME_msg_type_REQ message
- *
- * This function is called by lim_process_sme_req_messages() to send
- * eWNI_SME_START_RSP, eWNI_SME_STOP_BSS_RSP
- * or eWNI_SME_SWITCH_CHL_RSP messages to applications above MAC
- * Software.
- *
- * Return: None
- */
-
-void
-lim_send_sme_rsp(struct mac_context *mac_ctx, uint16_t msg_type,
- tSirResultCodes result_code, uint8_t sme_session_id,
- uint16_t sme_transaction_id)
+void lim_send_sme_rsp(struct mac_context *mac_ctx, uint16_t msg_type,
+ tSirResultCodes result_code, uint8_t sme_session_id)
{
struct scheduler_msg msg = {0};
tSirSmeRsp *sme_rsp;
@@ -89,9 +72,7 @@
sme_rsp->messageType = msg_type;
sme_rsp->length = sizeof(tSirSmeRsp);
sme_rsp->statusCode = result_code;
-
sme_rsp->sessionId = sme_session_id;
- sme_rsp->transactionId = sme_transaction_id;
msg.type = msg_type;
msg.bodyptr = sme_rsp;
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h
index 8015903..c291ab3 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h
@@ -34,9 +34,25 @@
#include "sir_api.h"
#include "sir_mac_prot_def.h"
-/* Functions for sending responses to Host */
-void lim_send_sme_rsp(struct mac_context *, uint16_t, tSirResultCodes, uint8_t,
- uint16_t);
+/* Functions for sending responses up the stack */
+
+/**
+ * lim_send_sme_rsp() - Send Generic Response to upper layers
+ * @mac_ctx: Pointer to Global MAC structure
+ * @msg_type: Indicates message type
+ * @result_code: Indicates the result of previously issued
+ * eWNI_SME_msg_type_REQ message
+ * @sme_session_id: SME session associated with the request
+ *
+ * This function is called by lim_process_sme_req_messages() to send
+ * eWNI_SME_START_RSP, eWNI_SME_STOP_BSS_RSP
+ * or eWNI_SME_SWITCH_CHL_RSP messages to applications above MAC
+ * Software.
+ *
+ * Return: None
+ */
+void lim_send_sme_rsp(struct mac_context *mac_ctx, uint16_t msg_type,
+ tSirResultCodes result_code, uint8_t sme_session_id);
/**
* lim_send_sme_start_bss_rsp() - Send Start BSS response
diff --git a/core/mac/src/pe/nan/nan_datapath.c b/core/mac/src/pe/nan/nan_datapath.c
index e264853..19b3064 100644
--- a/core/mac/src/pe/nan/nan_datapath.c
+++ b/core/mac/src/pe/nan/nan_datapath.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -435,8 +435,7 @@
/* Delete PE session once BSS is deleted */
if (NULL != session_entry) {
lim_send_sme_rsp(mac_ctx, eWNI_SME_STOP_BSS_RSP,
- rc, session_entry->smeSessionId,
- session_entry->transactionId);
+ rc, session_entry->smeSessionId);
pe_delete_session(mac_ctx, session_entry);
session_entry = NULL;
}