Procházet zdrojové kódy

qcacld-3.0: Fix NAN APIs when NAN data path feature is disabled

qcacld-2.0 to qcacld-3.0 propagation

Add NAN API wrapper function definitions and also fix compilation
failure when NAN data path feature is disabled.

Change-Id: Ib4a3133568eee0c2257c65bb0a8905c44048f0c2
CRs-Fixed: 1049546
Rakesh Sunki před 8 roky
rodič
revize
1f0553fd55
2 změnil soubory, kde provedl 17 přidání a 28 odebrání
  1. 17 15
      core/sme/inc/sme_nan_datapath.h
  2. 0 13
      core/sme/src/nan/nan_datapath_api.c

+ 17 - 15
core/sme/inc/sme_nan_datapath.h

@@ -86,14 +86,6 @@ QDF_STATUS sme_ndp_responder_req_handler(tHalHandle hal,
 /* NAN indication response handler */
 QDF_STATUS sme_ndp_end_req_handler(tHalHandle hal, struct ndp_end_req *req);
 
-/* NAN schedule update request handler */
-QDF_STATUS sme_ndp_sched_req_handler(uint32_t session_id,
-				struct ndp_schedule_update_req *req_params);
-
-/* Function to handle NDP messages from lower layers */
-void sme_ndp_message_processor(tpAniSirGlobal mac_ctx, uint16_t msg_type,
-				void *msg);
-
 /* Start NDI BSS */
 QDF_STATUS csr_roam_start_ndi(tpAniSirGlobal mac_ctx, uint32_t session_id,
 			      tCsrRoamProfile *profile);
@@ -124,6 +116,18 @@ void csr_release_ndp_data_end_req(tpAniSirGlobal mac_ctx, tSmeCmd *cmd);
 
 #else
 
+/* NAN initiator request handler */
+static inline QDF_STATUS sme_ndp_initiator_req_handler(tHalHandle hal,
+					void *req_params) {
+	return QDF_STATUS_SUCCESS;
+}
+
+/* NAN responder request handler */
+static inline QDF_STATUS sme_ndp_responder_req_handler(tHalHandle hal,
+					void *req_params) {
+	return QDF_STATUS_SUCCESS;
+}
+
 /* Start NDI BSS */
 static inline QDF_STATUS csr_roam_start_ndi(tpAniSirGlobal mac_ctx,
 					uint32_t session_id,
@@ -147,13 +151,11 @@ static inline void csr_roam_update_ndp_return_params(tpAniSirGlobal mac_ctx,
 {
 }
 
-/* NaN indication response handler */
-QDF_STATUS sme_ndp_end_req_handler(uint32_t session_id,
-					struct ndp_end_req *req_params);
-
-/* NaN schedule update request handler */
-QDF_STATUS sme_ndp_sched_req_handler(uint32_t session_id,
-				struct ndp_schedule_update_req *req_params);
+/* NAN indication response handler */
+static inline QDF_STATUS sme_ndp_end_req_handler(uint32_t session_id,
+				   void *req_params) {
+	return QDF_STATUS_SUCCESS;
+}
 
 static inline QDF_STATUS csr_process_ndp_initiator_request(
 				tpAniSirGlobal mac_ctx, tSmeCmd *cmd)

+ 0 - 13
core/sme/src/nan/nan_datapath_api.c

@@ -245,19 +245,6 @@ QDF_STATUS sme_ndp_end_req_handler(tHalHandle hal, struct ndp_end_req *req)
 	return ret;
 }
 
-/**
- * sme_ndp_sched_req_handler() - ndp schedule request handler
- * @session_id: session id over which the ndp is being created
- * @req_params: request parameters
- *
- * Return: QDF_STATUS_SUCCESS on success; error number otherwise
- */
-QDF_STATUS sme_ndp_sched_req_handler(uint32_t session_id,
-	struct ndp_schedule_update_req *req_params)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
 /**
  * csr_roam_start_ndi() - Start connection for NAN datapath
  * @mac_ctx: Global MAC context