From d37833f995378b20df2c7c16410e323d1d074a0a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Wed, 7 Mar 2018 14:22:44 -0800
Subject: [PATCH] qcacld-3.0: Relocate hdd_statistics_cb()

Function hdd_statistics_cb() is registered as a callback function by
__iw_get_statistics() when calling sme_get_statistics(). Since
hdd_statistics_cb() and __iw_get_statistics() are tightly coupled it
makes sense for them to be co-located, but currently they are
not. Therefore relocate hdd_statistics_cb() to be adjacent to
__iw_get_statistics(). Note that this is a precursor to further
cleanup of this pair of functions.

Change-Id: Ie36d107d9ef2e541444c5fb9d7bfba7e9e82c1e6
CRs-Fixed: 2201907
---
 core/hdd/src/wlan_hdd_wext.c | 96 ++++++++++++++++++------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 63a164fab0b4..df1ae7eccc35 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -4077,54 +4077,6 @@ int wlan_hdd_get_peer_info(struct hdd_adapter *adapter,
 	return ret;
 }
 
-/**
- * hdd_statistics_cb() - "Get statistics" callback function
- * @pStats: statistics payload
- * @pContext: opaque context originally passed to SME.  HDD always passes
- *	a pointer to an adapter
- *
- * Return: None
- */
-static void hdd_statistics_cb(void *pStats, void *pContext)
-{
-	struct hdd_adapter *adapter = (struct hdd_adapter *) pContext;
-	struct hdd_stats *pStatsCache = NULL;
-	struct hdd_wext_state *pWextState;
-	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
-
-	tCsrSummaryStatsInfo *pSummaryStats = NULL;
-	tCsrGlobalClassAStatsInfo *pClassAStats = NULL;
-	tCsrGlobalClassDStatsInfo *pClassDStats = NULL;
-
-	if (adapter != NULL)
-		pStatsCache = &adapter->hdd_stats;
-
-	pSummaryStats = (tCsrSummaryStatsInfo *) pStats;
-	pClassAStats = (tCsrGlobalClassAStatsInfo *) (pSummaryStats + 1);
-	pClassDStats = (tCsrGlobalClassDStatsInfo *) (pClassAStats + 1);
-
-	if (pStatsCache != NULL) {
-		/* copy the stats into the cache we keep in the
-		 * adapter instance structure
-		 */
-		qdf_mem_copy(&pStatsCache->summary_stat, pSummaryStats,
-			     sizeof(pStatsCache->summary_stat));
-		qdf_mem_copy(&pStatsCache->class_a_stat, pClassAStats,
-			     sizeof(pStatsCache->class_a_stat));
-		qdf_mem_copy(&pStatsCache->class_d_stat, pClassDStats,
-			     sizeof(pStatsCache->class_d_stat));
-	}
-
-	if (adapter) {
-		pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
-		qdf_status = qdf_event_set(&pWextState->hdd_qdf_event);
-		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			hdd_err("qdf_event_set failed");
-			return;
-		}
-	}
-}
-
 /**
  * hdd_clear_roam_profile_ie() - Clear Roam Profile IEs
  * @adapter: adapter who's IEs are to be cleared
@@ -9864,6 +9816,54 @@ static int iw_set_packet_filter_params(struct net_device *dev,
 #endif
 
 
+/**
+ * hdd_statistics_cb() - "Get statistics" callback function
+ * @pStats: statistics payload
+ * @pContext: opaque context originally passed to SME.  HDD always passes
+ *	a pointer to an adapter
+ *
+ * Return: None
+ */
+static void hdd_statistics_cb(void *pStats, void *pContext)
+{
+	struct hdd_adapter *adapter = (struct hdd_adapter *) pContext;
+	struct hdd_stats *pStatsCache = NULL;
+	struct hdd_wext_state *pWextState;
+	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
+
+	tCsrSummaryStatsInfo *pSummaryStats = NULL;
+	tCsrGlobalClassAStatsInfo *pClassAStats = NULL;
+	tCsrGlobalClassDStatsInfo *pClassDStats = NULL;
+
+	if (adapter != NULL)
+		pStatsCache = &adapter->hdd_stats;
+
+	pSummaryStats = (tCsrSummaryStatsInfo *) pStats;
+	pClassAStats = (tCsrGlobalClassAStatsInfo *) (pSummaryStats + 1);
+	pClassDStats = (tCsrGlobalClassDStatsInfo *) (pClassAStats + 1);
+
+	if (pStatsCache != NULL) {
+		/* copy the stats into the cache we keep in the
+		 * adapter instance structure
+		 */
+		qdf_mem_copy(&pStatsCache->summary_stat, pSummaryStats,
+			     sizeof(pStatsCache->summary_stat));
+		qdf_mem_copy(&pStatsCache->class_a_stat, pClassAStats,
+			     sizeof(pStatsCache->class_a_stat));
+		qdf_mem_copy(&pStatsCache->class_d_stat, pClassDStats,
+			     sizeof(pStatsCache->class_d_stat));
+	}
+
+	if (adapter) {
+		pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
+		qdf_status = qdf_event_set(&pWextState->hdd_qdf_event);
+		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
+			hdd_err("qdf_event_set failed");
+			return;
+		}
+	}
+}
+
 static int __iw_get_statistics(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)