From b94e64979e41ac2b69e2f5a9f417114b2d2fd3ff Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 9 Mar 2019 22:24:42 -0800 Subject: [PATCH] qcacld-3.0: Rename HDD identifier dot11RSNIE The Linux Coding Style frowns upon mixed-case names so rename HDD identifier dot11RSNIE to be compliant. Change-Id: I07beacb9a5682df858b888cf91715f4b1c233a55 CRs-Fixed: 2416631 --- core/hdd/src/wlan_hdd_assoc.c | 30 +++++++++++++++--------------- core/hdd/src/wlan_hdd_hostapd.c | 28 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index e5e222edee..af2491d44b 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -5241,7 +5241,7 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter, uint16_t gen_ie_len, uint8_t *gen_ie) { mac_handle_t mac_handle = hdd_adapter_get_mac_handle(adapter); - tDot11fIERSN dot11RSNIE = {0}; + tDot11fIERSN dot11_rsn_ie = {0}; tDot11fIEWPA dot11_wpa_ie = {0}; uint8_t *rsn_ie; uint16_t rsn_ie_len; @@ -5255,7 +5255,7 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter, * setting present flag to 0. */ memset(&dot11_wpa_ie, 0, sizeof(tDot11fIEWPA)); - memset(&dot11RSNIE, 0, sizeof(tDot11fIERSN)); + memset(&dot11_rsn_ie, 0, sizeof(tDot11fIERSN)); /* Type check */ if (gen_ie[0] == DOT11F_EID_RSN) { @@ -5271,38 +5271,38 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter, rsn_ie_len = gen_ie_len - 2; /* Unpack the RSN IE */ parse_status = sme_unpack_rsn_ie(mac_handle, rsn_ie, rsn_ie_len, - &dot11RSNIE, false); + &dot11_rsn_ie, false); if (!DOT11F_SUCCEEDED(parse_status)) { hdd_err("Invalid RSN IE: parse status %d", parse_status); return -EINVAL; } hdd_debug("gp_cipher_suite_present: %d", - dot11RSNIE.gp_cipher_suite_present); + dot11_rsn_ie.gp_cipher_suite_present); /* Copy out the encryption and authentication types */ hdd_debug("pairwise cipher suite count: %d", - dot11RSNIE.pwise_cipher_suite_count); + dot11_rsn_ie.pwise_cipher_suite_count); hdd_debug("authentication suite count: %d", - dot11RSNIE.akm_suite_cnt); - /* dot11RSNIE.akm_suite_cnt */ + dot11_rsn_ie.akm_suite_cnt); + /* dot11_rsn_ie.akm_suite_cnt */ /* Just translate the FIRST one */ *pAuthType = hdd_translate_rsn_to_csr_auth_type( - dot11RSNIE.akm_suite[0]); - /* dot11RSNIE.pwise_cipher_suite_count */ + dot11_rsn_ie.akm_suite[0]); + /* dot11_rsn_ie.pwise_cipher_suite_count */ *pEncryptType = hdd_translate_rsn_to_csr_encryption_type( - dot11RSNIE.pwise_cipher_suites[0]); - /* dot11RSNIE.gp_cipher_suite_count */ + dot11_rsn_ie.pwise_cipher_suites[0]); + /* dot11_rsn_ie.gp_cipher_suite_count */ *mcEncryptType = hdd_translate_rsn_to_csr_encryption_type( - dot11RSNIE.gp_cipher_suite); + dot11_rsn_ie.gp_cipher_suite); #ifdef WLAN_FEATURE_11W - *pMfpRequired = (dot11RSNIE.RSN_Cap[0] >> 6) & 0x1; - *pMfpCapable = csr_is_mfpc_capable(&dot11RSNIE); + *pMfpRequired = (dot11_rsn_ie.RSN_Cap[0] >> 6) & 0x1; + *pMfpCapable = csr_is_mfpc_capable(&dot11_rsn_ie); #endif #ifdef WLAN_CONV_CRYPTO_SUPPORTED - qdf_mem_copy(&rsn_cap, dot11RSNIE.RSN_Cap, sizeof(rsn_cap)); + qdf_mem_copy(&rsn_cap, dot11_rsn_ie.RSN_Cap, sizeof(rsn_cap)); wlan_crypto_set_vdev_param(adapter->vdev, WLAN_CRYPTO_PARAM_RSN_CAP, rsn_cap); #endif diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index fd0f6e6e24..b473cceb29 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -2693,7 +2693,7 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle, uint32_t ret; uint8_t *rsn_ie; uint16_t rsn_ie_len, i; - tDot11fIERSN dot11RSNIE = {0}; + tDot11fIERSN dot11_rsn_ie = {0}; tDot11fIEWPA dot11_wpa_ie = {0}; if (NULL == mac_handle) { @@ -2716,37 +2716,37 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle, rsn_ie = gen_ie + 2; rsn_ie_len = gen_ie_len - 2; /* Unpack the RSN IE */ - memset(&dot11RSNIE, 0, sizeof(tDot11fIERSN)); + memset(&dot11_rsn_ie, 0, sizeof(tDot11fIERSN)); ret = sme_unpack_rsn_ie(mac_handle, rsn_ie, rsn_ie_len, - &dot11RSNIE, false); + &dot11_rsn_ie, false); if (DOT11F_FAILED(ret)) { hdd_err("unpack failed, ret: 0x%x", ret); return -EINVAL; } /* Copy out the encryption and authentication types */ hdd_debug("pairwise cipher suite count: %d", - dot11RSNIE.pwise_cipher_suite_count); + dot11_rsn_ie.pwise_cipher_suite_count); hdd_debug("authentication suite count: %d", - dot11RSNIE.akm_suite_cnt); + dot11_rsn_ie.akm_suite_cnt); /* * Translate akms in akm suite */ - for (i = 0; i < dot11RSNIE.akm_suite_cnt; i++) + for (i = 0; i < dot11_rsn_ie.akm_suite_cnt; i++) akm_list->authType[i] = hdd_translate_rsn_to_csr_auth_type( - dot11RSNIE.akm_suite[i]); - akm_list->numEntries = dot11RSNIE.akm_suite_cnt; - /* dot11RSNIE.pwise_cipher_suite_count */ + dot11_rsn_ie.akm_suite[i]); + akm_list->numEntries = dot11_rsn_ie.akm_suite_cnt; + /* dot11_rsn_ie.pwise_cipher_suite_count */ *pEncryptType = - hdd_translate_rsn_to_csr_encryption_type(dot11RSNIE. + hdd_translate_rsn_to_csr_encryption_type(dot11_rsn_ie. pwise_cipher_suites[0]); - /* dot11RSNIE.gp_cipher_suite_count */ + /* dot11_rsn_ie.gp_cipher_suite_count */ *mcEncryptType = - hdd_translate_rsn_to_csr_encryption_type(dot11RSNIE. + hdd_translate_rsn_to_csr_encryption_type(dot11_rsn_ie. gp_cipher_suite); /* Set the PMKSA ID Cache for this interface */ - *pMFPCapable = 0 != (dot11RSNIE.RSN_Cap[0] & 0x80); - *pMFPRequired = 0 != (dot11RSNIE.RSN_Cap[0] & 0x40); + *pMFPCapable = 0 != (dot11_rsn_ie.RSN_Cap[0] & 0x80); + *pMFPRequired = 0 != (dot11_rsn_ie.RSN_Cap[0] & 0x40); } else if (gen_ie[0] == DOT11F_EID_WPA) { /* Validity checks */ if ((gen_ie_len < DOT11F_IE_WPA_MIN_LEN) ||