From b3d5253c22fe563e576bdb5b9ddbf8ee78f7b0f1 Mon Sep 17 00:00:00 2001
From: Pragaspathi Thilagaraj <tpragasp@codeaurora.org>
Date: Sat, 22 Jun 2019 22:37:55 +0530
Subject: [PATCH] qcacld-3.0: Replace typedef tLimMlmStaContext

Linux coding style doesn't allow camel case notations. So
replace tLimMlmStaContext with the original structure.

Change-Id: Iea2968d9cf993c405390f0ff9712755137cebc07
CRs-Fixed: 2482105
---
 core/mac/src/include/dph_global.h     |  2 +-
 core/mac/src/pe/include/lim_global.h  | 25 ++++++++++++++++++++++---
 core/mac/src/pe/lim/lim_assoc_utils.c |  5 +++--
 core/mac/src/pe/lim/lim_assoc_utils.h |  3 ++-
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/core/mac/src/include/dph_global.h b/core/mac/src/include/dph_global.h
index c0e66f9ba15a..3e9d5e2a2ecc 100644
--- a/core/mac/src/include/dph_global.h
+++ b/core/mac/src/include/dph_global.h
@@ -100,7 +100,7 @@ typedef struct sDphHashNode {
 	uint8_t fAniCount:1;
 	uint8_t rmfEnabled:1;
 	/* LIM state */
-	tLimMlmStaContext mlmStaContext;
+	struct lim_sta_context mlmStaContext;
 	/* qos parameter info */
 	tDphQosParams qos;
 	/*
diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h
index 693b31dda242..fba994fc3856 100644
--- a/core/mac/src/pe/include/lim_global.h
+++ b/core/mac/src/pe/include/lim_global.h
@@ -225,8 +225,27 @@ typedef struct tLimPreAuthTable {
 	tLimPreAuthNode **pTable;
 } tLimPreAuthTable, *tpLimPreAuthTable;
 
-/* / Per STA context structure definition */
-typedef struct sLimMlmStaContext {
+/**
+ * struct lim_sta_context - LIM per STA structure
+ * @mlmState: LIM State
+ * @authType: Authentication algorithm
+ * @akm_type: AKM of the connection
+ * @listenInterval: Listen interval
+ * @capabilityInfo: Capabilities
+ * @disassocReason: Disassociation reason code
+ * @resultCode:     Result code
+ * @subType:        Indicates association or reassociation
+ * @updateContext:  Update context
+ * @schClean:       Scheduler clean
+ * @htCapability:   802.11n HT capability
+ * @vhtCapability:  802.11ac VHT capability
+ * @cleanupTrigger: Cleanup trigger
+ * @protStatusCode: Protocol Status code
+ * @he_capable:     802.11ax HE capability
+ * @owe_ie:         Pointer to OWE IE
+ * @owe_ie_len:     Length of OWE IE
+ */
+struct lim_sta_context {
 	tLimMlmStates mlmState;
 	tAniAuthType authType;		/* auth algo in auth frame */
 	enum ani_akm_type akm_type;	/* akm in rsn/wpa ie */
@@ -250,7 +269,7 @@ typedef struct sLimMlmStaContext {
 	bool force_1x1;
 	uint8_t *owe_ie;
 	uint32_t owe_ie_len;
-} tLimMlmStaContext, *tpLimMlmStaContext;
+};
 
 /* Structure definition to hold deferred messages queue parameters */
 typedef struct sLimDeferredMsgQParams {
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 78d79eb274f7..c70408d1d6f6 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -686,7 +686,8 @@ lim_cleanup_rx_path(struct mac_context *mac, tpDphHashNode sta,
  */
 void
 lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
-		     uint16_t staDsAssocId, tLimMlmStaContext mlmStaContext,
+		     uint16_t staDsAssocId,
+		     struct lim_sta_context mlmStaContext,
 		     tSirResultCodes status_code, struct pe_session *pe_session)
 {
 	tLimMlmDisassocCnf mlmDisassocCnf;
@@ -4319,7 +4320,7 @@ lim_prepare_and_send_del_sta_cnf(struct mac_context *mac, tpDphHashNode sta,
 {
 	uint16_t staDsAssocId = 0;
 	struct qdf_mac_addr sta_dsaddr;
-	tLimMlmStaContext mlmStaContext;
+	struct lim_sta_context mlmStaContext;
 
 	if (!sta) {
 		pe_err("sta is NULL");
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h
index 35194f97cbbd..d89ef88ecbd3 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.h
+++ b/core/mac/src/pe/lim/lim_assoc_utils.h
@@ -168,7 +168,8 @@ static inline bool lim_is_roam_synch_in_progress(struct pe_session *pe_session)
 
 void
 lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
-		     uint16_t staDsAssocId, tLimMlmStaContext mlmStaContext,
+		     uint16_t staDsAssocId,
+		     struct lim_sta_context mlmStaContext,
 		     tSirResultCodes status_code,
 		     struct pe_session *pe_session);