qcacld-3.0: Cleanup NAN feature

Fix compilation errors when turning off WLAN_FEATURE_NAN

Change-Id: Ic1106d88ea7d9fc8d08f748a6b6e66e6e6607128
CRs-Fixed: 1067040

core/mac/inc/sir_api.h

@@ -4119,12 +4119,11 @@ typedef struct {
 } tSirStatsExtEvent, *tpSirStatsExtEvent;
 #endif
 
-#ifdef WLAN_FEATURE_NAN
 typedef struct {
 	uint32_t event_data_len;
 	uint8_t event_data[];
 } tSirNanEvent, *tpSirNanEvent;
-#endif
+
 typedef struct sSirSmeRoamOffloadSynchInd {
 	uint16_t messageType;   /*eWNI_SME_ROAM_OFFLOAD_SYNCH_IND */
 	uint16_t length;

core/sme/inc/nan_api.h

@@ -38,14 +38,25 @@
 
 #include "qdf_types.h"
 
+typedef void (*nan_callback)(void *, tSirNanEvent *);
+
+#ifdef WLAN_FEATURE_NAN
 typedef struct sNanRequestReq {
 	uint16_t request_data_len;
 	const uint8_t *request_data;
 } tNanRequestReq, *tpNanRequestReq;
 
-typedef void (*NanCallback)(void *, tSirNanEvent *);
-void sme_nan_register_callback(tHalHandle hHal, NanCallback callback);
+void sme_nan_register_callback(tHalHandle hHal, nan_callback callback);
 void sme_nan_deregister_callback(tHalHandle hHal);
 QDF_STATUS sme_nan_request(tpNanRequestReq input);
+#else
+static inline void sme_nan_register_callback(tHalHandle hHal,
+					     nan_callback callback)
+{
+}
+static inline void sme_nan_deregister_callback(tHalHandle hHal)
+{
+}
+#endif /* WLAN_FEATURE_NAN */
 
 #endif /* __NAN_API_H__ */

core/sme/src/nan/nan_api.c

@@ -46,7 +46,7 @@
  * Returns:
  * void
  *****************************************************************************/
-void sme_nan_register_callback(tHalHandle hHal, NanCallback callback)
+void sme_nan_register_callback(tHalHandle hHal, nan_callback callback)
 {
 	tpAniSirGlobal pMac = NULL;