From 9a0fde3a094b01410f5e4ede4395166c41b63489 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Fri, 8 Mar 2019 15:30:11 -0800
Subject: [PATCH] qcacld-3.0: Move wlan_hdd_cfg80211_extscan_callback()
 prototype

The wlan_hdd_cfg80211_extscan_callback() prototype is currently in
wlan_hdd_cfg80211.h, and uses different parameter names than the
implementation. Since the implementation is in wlan_hdd_ext_scan.c,
move the prototype to wlan_hdd_ext_scan.h, and exactly match the
implementation function signature.

Change-Id: Id3bd25f1ef885989b970a08a1e0f9540313c8032
CRs-Fixed: 2412964
---
 core/hdd/src/wlan_hdd_cfg80211.h | 10 ----------
 core/hdd/src/wlan_hdd_ext_scan.c |  8 --------
 core/hdd/src/wlan_hdd_ext_scan.h | 19 ++++++++++++++++++-
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h
index 798365efa2fe..cc5b23c050c4 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.h
+++ b/core/hdd/src/wlan_hdd_cfg80211.h
@@ -346,16 +346,6 @@ int wlan_hdd_send_hang_reason_event(struct hdd_context *hdd_ctx,
 int wlan_hdd_send_avoid_freq_for_dnbs(struct hdd_context *hdd_ctx,
 				      uint8_t op_chan);
 
-#ifdef FEATURE_WLAN_EXTSCAN
-void wlan_hdd_cfg80211_extscan_callback(hdd_handle_t hdd_handle,
-					const uint16_t evType, void *pMsg);
-#else
-static inline
-void wlan_hdd_cfg80211_extscan_callback(hdd_handle_t hdd_handle,
-					const uint16_t evType, void *pMsg)
-{
-}
-#endif /* FEATURE_WLAN_EXTSCAN */
 /**
  * wlan_hdd_rso_cmd_status_cb() - HDD callback to read RSO command status
  * @hdd_handle: opaque handle for the hdd context
diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c
index 05a2e09aac58..88157651526c 100644
--- a/core/hdd/src/wlan_hdd_ext_scan.c
+++ b/core/hdd/src/wlan_hdd_ext_scan.c
@@ -1354,14 +1354,6 @@ wlan_hdd_cfg80211_extscan_generic_rsp(struct hdd_context *hdd_ctx,
 	spin_unlock(&context->context_lock);
 }
 
-/**
- * wlan_hdd_cfg80211_extscan_callback() - ext scan callback
- * @hdd_handle: Opaque handle to hdd context
- * @event_id: Event identifier
- * @msg: Pointer to message
- *
- * Return: none
- */
 void wlan_hdd_cfg80211_extscan_callback(hdd_handle_t hdd_handle,
 					const uint16_t event_id, void *msg)
 {
diff --git a/core/hdd/src/wlan_hdd_ext_scan.h b/core/hdd/src/wlan_hdd_ext_scan.h
index 3c98fe213e92..4fc21055b348 100644
--- a/core/hdd/src/wlan_hdd_ext_scan.h
+++ b/core/hdd/src/wlan_hdd_ext_scan.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2014, 2017-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014, 2017-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
@@ -100,10 +100,27 @@ int wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy,
 						const void *data,
 						int data_len);
 
+/**
+ * wlan_hdd_cfg80211_extscan_callback() - ext scan callback
+ * @hdd_handle: Opaque handle to hdd context
+ * @event_id: Event identifier
+ * @msg: Pointer to message
+ *
+ * Return: none
+ */
+void wlan_hdd_cfg80211_extscan_callback(hdd_handle_t hdd_handle,
+					const uint16_t event_id, void *msg);
+
 void wlan_hdd_cfg80211_extscan_init(struct hdd_context *hdd_ctx);
 
 #else /* FEATURE_WLAN_EXTSCAN */
 
+static inline
+void wlan_hdd_cfg80211_extscan_callback(hdd_handle_t hdd_handle,
+					const uint16_t event_id, void *msg)
+{
+}
+
 static inline void wlan_hdd_cfg80211_extscan_init(struct hdd_context *hdd_ctx)
 {
 }