qcacld-3.0: Remove global oem data request/response buffer

Remove global oem data request/response buffer.

Change-Id: I95078c985c5034d9d530ad542ace129309d79886
CRs-Fixed: 1038872

5 files changed, 2 insertions, 54 deletions

diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h
index c51afa2d247e..9c38bf896e01 100644
--- a/core/mac/inc/ani_global.h
+++ b/core/mac/inc/ani_global.h
@@ -815,11 +815,6 @@ typedef struct sAniSirLim {
 	uint8_t gSmeSessionId;
 	uint16_t gTransactionId;
 
-#ifdef FEATURE_OEM_DATA_SUPPORT
-	tLimMlmOemDataReq *gpLimMlmOemDataReq;
-	tLimMlmOemDataRsp *gpLimMlmOemDataRsp;
-#endif
-
 	tSirRemainOnChnReq *gpLimRemainOnChanReq;       /* hold remain on chan request in this buf */
 	qdf_mutex_t lim_frame_register_lock;
 	qdf_list_t gLimMgmtFrameRegistratinQueue;
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index f450afb4d8d6..e418fd95554b 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -257,8 +257,6 @@ static void __lim_init_vars(tpAniSirGlobal pMac)
 	pMac->lim.gScanInPowersave = 0;
 	pMac->lim.probeCounter = 0;
 	pMac->lim.maxProbe = 0;
-
-	pMac->lim.gpLimMlmOemDataReq = NULL;
 }
 
 static void __lim_init_assoc_vars(tpAniSirGlobal pMac)
@@ -781,16 +779,6 @@ tSirRetStatus pe_close(tpAniSirGlobal pMac)
 	qdf_mem_free(pMac->lim.limTimers.gpLimCnfWaitTimer);
 	pMac->lim.limTimers.gpLimCnfWaitTimer = NULL;
 
-	if (pMac->lim.gpLimMlmOemDataReq) {
-		if (pMac->lim.gpLimMlmOemDataReq->data) {
-			qdf_mem_free(
-				pMac->lim.gpLimMlmOemDataReq->data);
-			pMac->lim.gpLimMlmOemDataReq->data = NULL;
-		}
-		qdf_mem_free(pMac->lim.gpLimMlmOemDataReq);
-		pMac->lim.gpLimMlmOemDataReq = NULL;
-	}
-
 	qdf_mem_free(pMac->lim.gpSession);
 	pMac->lim.gpSession = NULL;
 	if (!QDF_IS_STATUS_SUCCESS
diff --git a/core/sme/inc/oem_data_api.h b/core/sme/inc/oem_data_api.h
index c8cd1a38ac92..27b5e23cf467 100644
--- a/core/sme/inc/oem_data_api.h
+++ b/core/sme/inc/oem_data_api.h
@@ -39,22 +39,6 @@
 #include "sir_mac_prot_def.h"
 #include "csr_link_list.h"
 
-/* message subtype for internal purpose */
-#define OEM_MESSAGE_SUBTYPE_INTERNAL   0xdeadbeef
-#define OEM_MESSAGE_SUBTYPE_LEN 4
-
-/* Structure for defining req sent to the PE */
-typedef struct tagOemDataReq {
-	uint8_t sessionId;
-	uint32_t data_len;
-	uint8_t *data;
-} tOemDataReq, tOemDataReqConfig;
-
-typedef struct tagOemDataRsp {
-	uint32_t rsp_len;
-	uint8_t *oem_data_rsp;
-} tOemDataRsp;
-
 typedef enum {
 	eOEM_DATA_REQ_SUCCESS = 1,
 	eOEM_DATA_REQ_FAILURE,
@@ -68,10 +52,8 @@ QDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal);
  * HDD Callback function for the sme to callback when
  * the oem data rsp is available
  */
-typedef QDF_STATUS (*oem_data_oem_data_reqCompleteCallback)(tHalHandle,
-		void *p2, uint32_t oemDataReqID, eOemDataReqStatus status);
-
 typedef void (*sme_send_oem_data_rsp_msg)(tSirOemDataRsp *);
+
 #endif /* _OEM_DATA_API_H__ */
 
 #endif /* FEATURE_OEM_DATA_SUPPORT */
diff --git a/core/sme/inc/oem_data_internal.h b/core/sme/inc/oem_data_internal.h
index d432d9107c4c..1aef7147efe7 100644
--- a/core/sme/inc/oem_data_internal.h
+++ b/core/sme/inc/oem_data_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -42,24 +42,10 @@
 #include "oem_data_api.h"
 
 typedef struct tagOemDataStruct {
-	/* a global req id */
-	uint32_t nextOemReqId;
-	/* indicates that currently a request has been posted and */
-	bool oemDataReqActive;
-	/* callback function pointer for returning the response */
-	oem_data_oem_data_reqCompleteCallback callback;
-	/* context of the original caller */
-	void *pContext;
-	uint32_t oemDataReqID;              /* original request ID */
-	uint8_t sessionId;  /* Session on which oem data req is active */
 	/* callback for sending data response to oem application */
 	sme_send_oem_data_rsp_msg oem_data_rsp_callback;
 } tOemDataStruct;
 
-typedef struct tagOemDataCmd {
-	uint32_t oemDataReqID;
-	tOemDataReq oemDataReq;
-} tOemDataCmd;
 #endif /* __OEM_DATA_INTERNAL_H__ */
 
 #endif /* FEATURE_OEM_DATA_SUPPORT */
diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h
index a5405d26a490..16d5c47880ed 100644
--- a/core/sme/inc/sme_inside.h
+++ b/core/sme/inc/sme_inside.h
@@ -178,9 +178,6 @@ typedef struct tagSmeCmd {
 		tSetKeyCmd setKeyCmd;
 		tGenericPmcCmd pmcCmd;
 		tGenericQosCmd qosCmd;
-#ifdef FEATURE_OEM_DATA_SUPPORT
-		tOemDataCmd oemDataCmd;
-#endif
 		tRemainChlCmd remainChlCmd;
 		tNoACmd NoACmd;
 		tAddStaForSessionCmd addStaSessionCmd;