From 5287de517604fdc33d71ed4e533c5eb17fa9d2dd Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 28 Oct 2017 12:23:06 -0700 Subject: [PATCH] qcacld-3.0: Rename pScanInfo The Linux Coding Style frowns upon mixed-case names and so-called Hungarian notation, so rename pScanInfo to align with the Coding Style. Change-Id: I2873e1121e412ea68561f02da74d231c37e58eeb CRs-Fixed: 2134936 --- core/hdd/inc/wlan_hdd_main.h | 1 + core/hdd/src/wlan_hdd_cfg80211.c | 6 ++--- core/hdd/src/wlan_hdd_hostapd.c | 12 ++++----- core/hdd/src/wlan_hdd_power.c | 4 +-- core/hdd/src/wlan_hdd_scan.c | 46 ++++++++++++++++---------------- 5 files changed, 35 insertions(+), 34 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 1d67241db3a8..533567ba6887 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -46,6 +46,7 @@ #define pHddStaCtx #define pHostapdState #define pRoamInfo +#define pScanInfo #define pBeaconIes /* diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 6d36871c7672..0b2792797774 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -17672,7 +17672,7 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy, (sta_ctx->conn_info.connState == eConnectionState_Connecting)) { eCsrRoamDisconnectReason reasonCode = eCSR_DISCONNECT_REASON_UNSPECIFIED; - struct hdd_scan_info *pScanInfo; + struct hdd_scan_info *scan_info; switch (reason) { case WLAN_REASON_MIC_FAILURE: @@ -17707,8 +17707,8 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy, reasonCode = eCSR_DISCONNECT_REASON_UNSPECIFIED; break; } - pScanInfo = &adapter->scan_info; - if (pScanInfo->mScanPending) { + scan_info = &adapter->scan_info; + if (scan_info->mScanPending) { hdd_debug("Disconnect is in progress, Aborting Scan"); wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID, adapter->sessionId, INVALID_SCAN_ID, false); diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index ae9892f73bcf..362875131206 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -1533,7 +1533,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, uint8_t we_custom_start_event[64]; char *startBssEvent; struct hdd_context *hdd_ctx; - struct hdd_scan_info *pScanInfo = NULL; + struct hdd_scan_info *scan_info = NULL; struct iw_michaelmicfailure msg; uint8_t ignoreCAC = 0; struct hdd_config *cfg = NULL; @@ -2135,9 +2135,9 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, } qdf_mem_free(sta_info); } - pScanInfo = &adapter->scan_info; + scan_info = &adapter->scan_info; /* Lets abort scan to ensure smooth authentication for client */ - if ((pScanInfo != NULL) && pScanInfo->mScanPending) { + if ((scan_info != NULL) && scan_info->mScanPending) { wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID, adapter->sessionId, INVALID_SCAN_ID, false); } @@ -8182,7 +8182,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, { struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *hdd_ctx = wiphy_priv(wiphy); - struct hdd_scan_info *pScanInfo = NULL; + struct hdd_scan_info *scan_info = NULL; struct hdd_adapter *staAdapter = NULL; QDF_STATUS status = QDF_STATUS_E_FAILURE; QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; @@ -8244,9 +8244,9 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, if (QDF_STA_MODE == staAdapter->device_mode || (QDF_P2P_CLIENT_MODE == staAdapter->device_mode) || (QDF_P2P_GO_MODE == staAdapter->device_mode)) { - pScanInfo = &staAdapter->scan_info; + scan_info = &staAdapter->scan_info; - if (pScanInfo && pScanInfo->mScanPending) { + if (scan_info && scan_info->mScanPending) { hdd_debug("Aborting pending scan for device mode:%d", staAdapter->device_mode); wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID, diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index eb090d34e4a3..cf07dd3b67c7 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -1758,7 +1758,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, p_cds_sched_context cds_sched_context = get_cds_sched_ctxt(); hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; struct hdd_adapter *adapter; - struct hdd_scan_info *pScanInfo; + struct hdd_scan_info *scan_info; QDF_STATUS status; int rc; @@ -1829,7 +1829,7 @@ next_adapter: status = hdd_get_front_adapter(hdd_ctx, &pAdapterNode); while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { adapter = pAdapterNode->adapter; - pScanInfo = &adapter->scan_info; + scan_info = &adapter->scan_info; if (sme_neighbor_middle_of_roaming (hdd_ctx->hHal, adapter->sessionId)) { diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 08878c55dff2..7abb8e97993b 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -450,7 +450,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); struct hdd_config *cfg_param = NULL; int status; - struct hdd_scan_info *pScanInfo = NULL; + struct hdd_scan_info *scan_info = NULL; struct hdd_adapter *con_sap_adapter; uint16_t con_dfs_ch; struct hdd_wext_state *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); @@ -515,7 +515,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, } cfg_param = hdd_ctx->config; - pScanInfo = &adapter->scan_info; + scan_info = &adapter->scan_info; /* Block All Scan during DFS operation and send null scan result */ con_sap_adapter = hdd_get_con_sap_adapter(adapter, true); @@ -612,30 +612,30 @@ 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(&pScanInfo->scanAddIE, 0, sizeof(pScanInfo->scanAddIE)); - memcpy(pScanInfo->scanAddIE.addIEdata, request->ie, + memset(&scan_info->scanAddIE, 0, sizeof(scan_info->scanAddIE)); + memcpy(scan_info->scanAddIE.addIEdata, request->ie, request->ie_len); - pScanInfo->scanAddIE.length = request->ie_len; + scan_info->scanAddIE.length = request->ie_len; - wlan_hdd_update_scan_ies(adapter, pScanInfo, - pScanInfo->scanAddIE.addIEdata, - &pScanInfo->scanAddIE.length); + wlan_hdd_update_scan_ies(adapter, scan_info, + scan_info->scanAddIE.addIEdata, + &scan_info->scanAddIE.length); } else { - if (pScanInfo->default_scan_ies && - pScanInfo->default_scan_ies_len) { - qdf_mem_copy(pScanInfo->scanAddIE.addIEdata, - pScanInfo->default_scan_ies, - pScanInfo->default_scan_ies_len); - pScanInfo->scanAddIE.length = - pScanInfo->default_scan_ies_len; + if (scan_info->default_scan_ies && + scan_info->default_scan_ies_len) { + qdf_mem_copy(scan_info->scanAddIE.addIEdata, + scan_info->default_scan_ies, + scan_info->default_scan_ies_len); + scan_info->scanAddIE.length = + scan_info->default_scan_ies_len; params.default_ie.ptr = - qdf_mem_malloc(pScanInfo->default_scan_ies_len); + qdf_mem_malloc(scan_info->default_scan_ies_len); if (params.default_ie.ptr != NULL) { qdf_mem_copy(params.default_ie.ptr, - pScanInfo->default_scan_ies, - pScanInfo->default_scan_ies_len); + scan_info->default_scan_ies, + scan_info->default_scan_ies_len); params.default_ie.len = - pScanInfo->default_scan_ies_len; + 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 = - pScanInfo->scanAddIE.addIEdata; + scan_info->scanAddIE.addIEdata; pwextBuf->roamProfile.nAddIEScanLength = - pScanInfo->scanAddIE.length; + scan_info->scanAddIE.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 = pScanInfo->scanAddIE.length; - scan_req.pIEField = pScanInfo->scanAddIE.addIEdata; + scan_req.uIEFieldLen = scan_info->scanAddIE.length; + scan_req.pIEField = scan_info->scanAddIE.addIEdata; /* acquire the wakelock to avoid the apps suspend during the scan. To * address the following issues.