From c8d94a1ad13f8cfc25321e7b60454b4a72cab24d Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 27 Oct 2017 14:02:53 -0700 Subject: [PATCH] qcacld-3.0: Rename hdd_ap_ctx uPrivacy field Per the Linux coding style "mixed-case names are frowned upon" and "so-called Hungarian notation [...] is brain damaged" so rename field uPrivacy in struct hdd_ap_ctx. Change-Id: I9e0af2e7b61b4678f28868142a0864b1d5d5db77 CRs-Fixed: 2134920 --- core/hdd/inc/wlan_hdd_main.h | 4 ++-- core/hdd/src/wlan_hdd_hostapd.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index e30a69b87509..ffc61e80b853 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -810,12 +810,12 @@ struct hdd_station_info { * struct hdd_ap_ctx - SAP/P2PGO specific information * @hostapd_state: state control information * @broadcast_sta_id: Station ID assigned after BSS starts + * @privacy: The privacy bits of configuration */ struct hdd_ap_ctx { struct hdd_hostapd_state hostapd_state; uint8_t broadcast_sta_id; - - uint8_t uPrivacy; /* The privacy bits of configuration */ + uint8_t privacy; tSirWPSPBCProbeReq WPSPBCProbeReq; diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 69116a7c5c15..9efa39167d57 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -1513,7 +1513,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, /* @@@ need wep logic here to set privacy bit */ qdf_status = hdd_softap_register_bc_sta(adapter, - ap_ctx->uPrivacy); + ap_ctx->privacy); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hdd_warn("Failed to register BC STA %d", qdf_status); @@ -1888,7 +1888,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, qdf_status = hdd_softap_register_sta( adapter, true, - ap_ctx->uPrivacy, + ap_ctx->privacy, event->staId, 0, 0, (struct qdf_mac_addr *) wrqu.addr.sa_data, @@ -1901,7 +1901,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, qdf_status = hdd_softap_register_sta( adapter, false, - ap_ctx->uPrivacy, + ap_ctx->privacy, event->staId, 0, 0, (struct qdf_mac_addr *) wrqu.addr.sa_data, @@ -7729,7 +7729,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter, pConfig->privacy = (pMgmt_frame->u.beacon.capab_info & WLAN_CAPABILITY_PRIVACY) ? true : false; - (WLAN_HDD_GET_AP_CTX_PTR(adapter))->uPrivacy = pConfig->privacy; + (WLAN_HDD_GET_AP_CTX_PTR(adapter))->privacy = pConfig->privacy; /*Set wps station to configured */ pIe = wlan_hdd_get_wps_ie_ptr(pBeacon->tail, pBeacon->tail_len);