From 37fa040541a870934bb888237e225a35724492ee Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Sat, 28 Oct 2017 12:42:29 -0700
Subject: [PATCH] qcacld-3.0: Rename hdd_scan_info scanAddIE field

Per the Linux coding style "mixed-case names are frowned upon" so
rename field scanAddIE in struct hdd_scan_info.

Change-Id: I8cc53023d703f91a8d63d8831a6eaaaea6ab9f4a
CRs-Fixed: 2134938
---
 core/hdd/inc/wlan_hdd_main.h     |  4 ++--
 core/hdd/src/wlan_hdd_cfg80211.c |  8 ++++----
 core/hdd/src/wlan_hdd_scan.c     | 22 +++++++++++-----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index 533567ba68..ce0ba1249a 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -884,14 +884,14 @@ struct hdd_ap_ctx {
 /**
  * struct hdd_scan_info - Per-adapter scan information
  * @mScanPending: is a scan pending on this adapter?
- * @scanAddIE: Additional IE for scan
+ * @scan_add_ie: Additional IE for scan
  * @default_scan_ies: Default scan IEs
  * @default_scan_ies_len: Length of @default_scan_ies
  * @scan_mode: Scan mode
  */
 struct hdd_scan_info {
 	uint32_t mScanPending;
-	tSirAddie scanAddIE;
+	tSirAddie scan_add_ie;
 	uint8_t *default_scan_ies;
 	uint16_t default_scan_ies_len;
 	tSirScanType scan_mode;
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 0b27927977..bd482ba99a 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -13811,9 +13811,9 @@ static int wlan_hdd_change_client_iface_to_new_mode(struct net_device *ndev,
 	memset(&adapter->sessionCtx, 0, sizeof(adapter->sessionCtx));
 	hdd_set_station_ops(adapter->dev);
 	wext = WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
-	wext->roamProfile.pAddIEScan = adapter->scan_info.scanAddIE.addIEdata;
+	wext->roamProfile.pAddIEScan = adapter->scan_info.scan_add_ie.addIEdata;
 	wext->roamProfile.nAddIEScanLength =
-		adapter->scan_info.scanAddIE.length;
+		adapter->scan_info.scan_add_ie.length;
 	if (type == NL80211_IFTYPE_ADHOC) {
 		status = hdd_init_station_mode(adapter);
 		wext->roamProfile.BSSType = eCSR_BSS_TYPE_START_IBSS;
@@ -15898,9 +15898,9 @@ static int wlan_hdd_cfg80211_connect_start(struct hdd_adapter *adapter,
 		if ((adapter->device_mode == QDF_P2P_CLIENT_MODE) &&
 		    (!roam_profile->pAddIEScan)) {
 			roam_profile->pAddIEScan =
-				&adapter->scan_info.scanAddIE.addIEdata[0];
+				&adapter->scan_info.scan_add_ie.addIEdata[0];
 			roam_profile->nAddIEScanLength =
-				adapter->scan_info.scanAddIE.length;
+				adapter->scan_info.scan_add_ie.length;
 		}
 
 		if ((policy_mgr_is_hw_dbs_capable(hdd_ctx->hdd_psoc) == true)
diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c
index 7abb8e9799..281ba08c99 100644
--- a/core/hdd/src/wlan_hdd_scan.c
+++ b/core/hdd/src/wlan_hdd_scan.c
@@ -612,21 +612,21 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 	/* Store the Scan IE's in Adapter*/
 	if (request->ie_len) {
 		/* save this for future association (join requires this) */
-		memset(&scan_info->scanAddIE, 0, sizeof(scan_info->scanAddIE));
-		memcpy(scan_info->scanAddIE.addIEdata, request->ie,
+		memset(&scan_info->scan_add_ie, 0, sizeof(scan_info->scan_add_ie));
+		memcpy(scan_info->scan_add_ie.addIEdata, request->ie,
 		       request->ie_len);
-		scan_info->scanAddIE.length = request->ie_len;
+		scan_info->scan_add_ie.length = request->ie_len;
 
 		wlan_hdd_update_scan_ies(adapter, scan_info,
-				scan_info->scanAddIE.addIEdata,
-				&scan_info->scanAddIE.length);
+				scan_info->scan_add_ie.addIEdata,
+				&scan_info->scan_add_ie.length);
 	} else {
 		if (scan_info->default_scan_ies &&
 		    scan_info->default_scan_ies_len) {
-			qdf_mem_copy(scan_info->scanAddIE.addIEdata,
+			qdf_mem_copy(scan_info->scan_add_ie.addIEdata,
 				     scan_info->default_scan_ies,
 				     scan_info->default_scan_ies_len);
-			scan_info->scanAddIE.length =
+			scan_info->scan_add_ie.length =
 				scan_info->default_scan_ies_len;
 			params.default_ie.ptr =
 				qdf_mem_malloc(scan_info->default_scan_ies_len);
@@ -644,9 +644,9 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 	    (QDF_P2P_CLIENT_MODE == adapter->device_mode) ||
 	    (QDF_P2P_DEVICE_MODE == adapter->device_mode)) {
 		pwextBuf->roamProfile.pAddIEScan =
-			scan_info->scanAddIE.addIEdata;
+			scan_info->scan_add_ie.addIEdata;
 		pwextBuf->roamProfile.nAddIEScanLength =
-			scan_info->scanAddIE.length;
+			scan_info->scan_add_ie.length;
 	}
 
 	if ((request->n_ssids == 1) && (request->ssids != NULL) &&
@@ -820,8 +820,8 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 		}
 	}
 
-	scan_req.uIEFieldLen = scan_info->scanAddIE.length;
-	scan_req.pIEField = scan_info->scanAddIE.addIEdata;
+	scan_req.uIEFieldLen = scan_info->scan_add_ie.length;
+	scan_req.pIEField = scan_info->scan_add_ie.addIEdata;
 
 	/* acquire the wakelock to avoid the apps suspend during the scan. To
 	 * address the following issues.