From cdde6c3156ef080a1dde9889f1e7b78d1db34c5c Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 9 Mar 2019 23:03:49 -0800 Subject: [PATCH] qcacld-3.0: Rename HDD identifier mcEncryptType The Linux Coding Style frowns upon mixed-case names so rename HDD identifier mcEncryptType to be compliant. Change-Id: Ica46896ac8139dede8f6654acedfec04ed46e4fa CRs-Fixed: 2416633 --- core/hdd/src/wlan_hdd_assoc.c | 8 ++++---- core/hdd/src/wlan_hdd_hostapd.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index ad9bc2ac76b8..594e88a02e4f 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -5225,7 +5225,7 @@ bool hdd_is_fils_connection(struct hdd_adapter *adapter) * @adapter: pointer to adapter * @bssid: pointer to mac address * @encrypt_type: pointer to encryption type - * @mcEncryptType: pointer to multicast encryption type + * @mc_encrypt_type: pointer to multicast encryption type * @auth_type: pointer to auth type * * Return: 0 on success, error number otherwise @@ -5233,7 +5233,7 @@ bool hdd_is_fils_connection(struct hdd_adapter *adapter) static int32_t hdd_process_genie(struct hdd_adapter *adapter, u8 *bssid, eCsrEncryptionType *encrypt_type, - eCsrEncryptionType *mcEncryptType, + eCsrEncryptionType *mc_encrypt_type, eCsrAuthType *auth_type, #ifdef WLAN_FEATURE_11W uint8_t *pMfpRequired, uint8_t *pMfpCapable, @@ -5294,7 +5294,7 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter, hdd_translate_rsn_to_csr_encryption_type( dot11_rsn_ie.pwise_cipher_suites[0]); /* dot11_rsn_ie.gp_cipher_suite_count */ - *mcEncryptType = + *mc_encrypt_type = hdd_translate_rsn_to_csr_encryption_type( dot11_rsn_ie.gp_cipher_suite); #ifdef WLAN_FEATURE_11W @@ -5341,7 +5341,7 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter, hdd_translate_wpa_to_csr_encryption_type( dot11_wpa_ie.unicast_ciphers[0]); /* dot11_wpa_ie.unicast_cipher_count */ - *mcEncryptType = + *mc_encrypt_type = hdd_translate_wpa_to_csr_encryption_type( dot11_wpa_ie.multicast_cipher); } else { diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 04fd6579b4a6..5220fd716798 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -2684,7 +2684,7 @@ stopbss: static int hdd_softap_unpack_ie(mac_handle_t mac_handle, eCsrEncryptionType *encrypt_type, - eCsrEncryptionType *mcEncryptType, + eCsrEncryptionType *mc_encrypt_type, tCsrAuthList *akm_list, bool *pMFPCapable, bool *pMFPRequired, @@ -2741,7 +2741,7 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle, hdd_translate_rsn_to_csr_encryption_type(dot11_rsn_ie. pwise_cipher_suites[0]); /* dot11_rsn_ie.gp_cipher_suite_count */ - *mcEncryptType = + *mc_encrypt_type = hdd_translate_rsn_to_csr_encryption_type(dot11_rsn_ie. gp_cipher_suite); /* Set the PMKSA ID Cache for this interface */ @@ -2784,7 +2784,7 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle, hdd_translate_wpa_to_csr_encryption_type(dot11_wpa_ie. unicast_ciphers[0]); /* dot11_wpa_ie.unicast_cipher_count */ - *mcEncryptType = + *mc_encrypt_type = hdd_translate_wpa_to_csr_encryption_type(dot11_wpa_ie. multicast_cipher); *pMFPCapable = false;