From e6bf719666279b1a45b5aecc5504ae72cb74120a Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Tue, 7 Nov 2017 15:16:09 -0800 Subject: [PATCH] qcacld-3.0: Rename struct tagCsrDelStaParams Per the Linux coding style "mixed-case names are frowned upon" so rename struct tagCsrDelStaParams. Change-Id: I60d6448f4bae15e604a8ea55e72a6070a6ebdfbe CRs-Fixed: 2140346 --- core/hdd/src/wlan_hdd_cfg80211.c | 4 ++-- core/hdd/src/wlan_hdd_hostapd.c | 4 ++-- core/hdd/src/wlan_hdd_hostapd.h | 4 ++-- core/hdd/src/wlan_hdd_main.c | 4 ++-- core/sap/inc/sap_api.h | 6 +++--- core/sap/src/sap_module.c | 10 +++++----- core/sme/inc/csr_api.h | 2 +- core/sme/inc/sme_api.h | 4 ++-- core/sme/src/common/sme_api.c | 4 ++-- core/sme/src/csr/csr_api_roam.c | 4 ++-- core/sme/src/csr/csr_inside_api.h | 4 ++-- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 7ec2f664ac0f..816f5a298919 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -18391,7 +18391,7 @@ static int wlan_hdd_set_txq_params(struct wiphy *wiphy, static int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, - struct tagCsrDelStaParams *pDelStaParams) + struct csr_del_sta_params *pDelStaParams) { struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *hdd_ctx; @@ -18607,7 +18607,7 @@ int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, #endif { int ret; - struct tagCsrDelStaParams delStaParams; + struct csr_del_sta_params delStaParams; cds_ssr_protect(__func__); #if defined(USE_CFG80211_DEL_STA_V2) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 83eb2e970850..eefe9d6fc2df 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -797,7 +797,7 @@ static void hdd_clear_sta(struct hdd_adapter *adapter, uint8_t sta_id) { struct hdd_ap_ctx *ap_ctx; struct hdd_station_info *sta_info; - struct tagCsrDelStaParams del_sta_params; + struct csr_del_sta_params del_sta_params; ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter); @@ -4659,7 +4659,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev, struct hdd_context *hdd_ctx; uint8_t *peerMacAddr; int ret; - struct tagCsrDelStaParams del_sta_params; + struct csr_del_sta_params del_sta_params; ENTER_DEV(dev); diff --git a/core/hdd/src/wlan_hdd_hostapd.h b/core/hdd/src/wlan_hdd_hostapd.h index 52763aed2e06..6df37d963a1d 100644 --- a/core/hdd/src/wlan_hdd_hostapd.h +++ b/core/hdd/src/wlan_hdd_hostapd.h @@ -112,9 +112,9 @@ eCsrEncryptionType hdd_translate_wpa_to_csr_encryption_type(uint8_t cipher_suite[4]); QDF_STATUS hdd_softap_sta_deauth(struct hdd_adapter *adapter, - struct tagCsrDelStaParams *pDelStaParams); + struct csr_del_sta_params *pDelStaParams); void hdd_softap_sta_disassoc(struct hdd_adapter *adapter, - struct tagCsrDelStaParams *pDelStaParams); + struct csr_del_sta_params *pDelStaParams); int hdd_softap_unpack_ie(tHalHandle halHandle, eCsrEncryptionType *pEncryptType, eCsrEncryptionType *mcEncryptType, diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index d0983742bc35..8105afa51021 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -10202,7 +10202,7 @@ void hdd_deregister_cb(struct hdd_context *hdd_ctx) * Return: None */ QDF_STATUS hdd_softap_sta_deauth(struct hdd_adapter *adapter, - struct tagCsrDelStaParams *pDelStaParams) + struct csr_del_sta_params *pDelStaParams) { QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; @@ -10230,7 +10230,7 @@ QDF_STATUS hdd_softap_sta_deauth(struct hdd_adapter *adapter, * Return: None */ void hdd_softap_sta_disassoc(struct hdd_adapter *adapter, - struct tagCsrDelStaParams *pDelStaParams) + struct csr_del_sta_params *pDelStaParams) { ENTER(); diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index 61d957f3f641..e9ec5c578be4 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -1015,7 +1015,7 @@ QDF_STATUS wlansap_set_mac_acl(struct sap_context *sap_ctx, * QDF_STATUS_SUCCESS: Success */ QDF_STATUS wlansap_disassoc_sta(struct sap_context *sap_ctx, - struct tagCsrDelStaParams *p_del_sta_params); + struct csr_del_sta_params *p_del_sta_params); /** * wlansap_deauth_sta() - Ap App/HDD initiated deauthentication of station @@ -1028,7 +1028,7 @@ QDF_STATUS wlansap_disassoc_sta(struct sap_context *sap_ctx, * Return: The QDF_STATUS code associated with performing the operation */ QDF_STATUS wlansap_deauth_sta(struct sap_context *sap_ctx, - struct tagCsrDelStaParams *pDelStaParams); + struct csr_del_sta_params *pDelStaParams); /** * wlansap_set_channel_change_with_csa() - Set channel change with CSA @@ -1329,7 +1329,7 @@ QDF_STATUS wlan_sap_set_vendor_acs(struct sap_context *sap_context, void wlansap_populate_del_sta_params(const uint8_t *mac, uint16_t reason_code, uint8_t subtype, - struct tagCsrDelStaParams *pDelStaParams); + struct csr_del_sta_params *pDelStaParams); /** * wlansap_acs_chselect() - Initiates acs channel selection diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 14deafcff9be..8aa3eb3d5909 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -1011,7 +1011,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, } else if (cmd == DELETE_STA_FROM_ACL) { if (sta_white_list) { - struct tagCsrDelStaParams delStaParams; + struct csr_del_sta_params delStaParams; QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, @@ -1048,7 +1048,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, case eSAP_BLACK_LIST: if (cmd == ADD_STA_TO_ACL) { - struct tagCsrDelStaParams delStaParams; + struct csr_del_sta_params delStaParams; /* error check */ /* if list is already at max, return failure */ if (sap_ctx->nDenyMac == MAX_ACL_MAC_ADDRESS) { @@ -1140,7 +1140,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, } QDF_STATUS wlansap_disassoc_sta(struct sap_context *sap_ctx, - struct tagCsrDelStaParams *p_del_sta_params) + struct csr_del_sta_params *p_del_sta_params) { if (NULL == sap_ctx) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, @@ -1155,7 +1155,7 @@ QDF_STATUS wlansap_disassoc_sta(struct sap_context *sap_ctx, } QDF_STATUS wlansap_deauth_sta(struct sap_context *sap_ctx, - struct tagCsrDelStaParams *pDelStaParams) + struct csr_del_sta_params *pDelStaParams) { QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; @@ -2487,7 +2487,7 @@ QDF_STATUS wlansap_set_dfs_nol(struct sap_context *sap_ctx, void wlansap_populate_del_sta_params(const uint8_t *mac, uint16_t reason_code, uint8_t subtype, - struct tagCsrDelStaParams *pDelStaParams) + struct csr_del_sta_params *pDelStaParams) { if (NULL == mac) qdf_set_macaddr_broadcast(&pDelStaParams->peerMacAddr); diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 1ab0845045db..f08b204c3b6b 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1684,7 +1684,7 @@ typedef struct tagCsrEseBeaconReq { } tCsrEseBeaconReq, *tpCsrEseBeaconReq; #endif /* FEATURE_WLAN_ESE */ -struct tagCsrDelStaParams { +struct csr_del_sta_params { struct qdf_mac_addr peerMacAddr; uint16_t reason_code; uint8_t subtype; diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 09e8b7ad35da..bc15e24fbbcb 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -327,9 +327,9 @@ QDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, void *pfnSapEventCallback, uint8_t *pAssocStasBuf); QDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, - struct tagCsrDelStaParams *p_del_sta_params); + struct csr_del_sta_params *p_del_sta_params); QDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, - struct tagCsrDelStaParams *pDelStaParams); + struct csr_del_sta_params *pDelStaParams); QDF_STATUS sme_roam_get_connect_state(tHalHandle hHal, uint8_t sessionId, eCsrConnectState *pState); QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 9c6280869d9a..5aa3cb026da7 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -3439,7 +3439,7 @@ QDF_STATUS sme_roam_stop_bss(tHalHandle hHal, uint8_t sessionId) * be called to indicate actual result. */ QDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, - struct tagCsrDelStaParams *p_del_sta_params) + struct csr_del_sta_params *p_del_sta_params) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -3475,7 +3475,7 @@ QDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, * result */ QDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, - struct tagCsrDelStaParams *pDelStaParams) + struct csr_del_sta_params *pDelStaParams) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 52c557123806..0c9b6ceef44d 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -4039,7 +4039,7 @@ QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, */ QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, - struct tagCsrDelStaParams + struct csr_del_sta_params *p_del_sta_params) { @@ -4080,7 +4080,7 @@ QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, */ QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, - struct tagCsrDelStaParams *pDelStaParams) + struct csr_del_sta_params *pDelStaParams) { QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index f8d0c3889ad8..59a20ca8793e 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -987,7 +987,7 @@ void csr_call_roaming_completion_callback(tpAniSirGlobal pMac, */ QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, - struct tagCsrDelStaParams + struct csr_del_sta_params *p_del_sta_params); /** * csr_roam_issue_deauth_sta_cmd() - issue deauthenticate station command @@ -1001,7 +1001,7 @@ QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, */ QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, - struct tagCsrDelStaParams *pDelStaParams); + struct csr_del_sta_params *pDelStaParams); /* * csr_roam_get_associated_stas