Browse Source

qcacld-3.0: Rename HDD identifier dot11WPAIE

The Linux Coding Style frowns upon mixed-case names so rename HDD
identifier dot11WPAIE to be compliant.

Change-Id: I12298bd50ff47511dd9c88a546c66042fe828def
CRs-Fixed: 2416630
Jeff Johnson 6 years ago
parent
commit
6a2c0ca8eb
3 changed files with 28 additions and 28 deletions
  1. 11 11
      core/hdd/src/wlan_hdd_assoc.c
  2. 4 4
      core/hdd/src/wlan_hdd_cfg80211.c
  3. 13 13
      core/hdd/src/wlan_hdd_hostapd.c

+ 11 - 11
core/hdd/src/wlan_hdd_assoc.c

@@ -5242,7 +5242,7 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
 {
 	mac_handle_t mac_handle = hdd_adapter_get_mac_handle(adapter);
 	tDot11fIERSN dot11RSNIE = {0};
-	tDot11fIEWPA dot11WPAIE = {0};
+	tDot11fIEWPA dot11_wpa_ie = {0};
 	uint8_t *rsn_ie;
 	uint16_t rsn_ie_len;
 	uint32_t parse_status;
@@ -5254,7 +5254,7 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
 	 * Clear struct of tDot11fIERSN and tDot11fIEWPA specifically
 	 * setting present flag to 0.
 	 */
-	memset(&dot11WPAIE, 0, sizeof(tDot11fIEWPA));
+	memset(&dot11_wpa_ie, 0, sizeof(tDot11fIEWPA));
 	memset(&dot11RSNIE, 0, sizeof(tDot11fIERSN));
 
 	/* Type check */
@@ -5320,7 +5320,7 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
 		/* Unpack the WPA IE */
 		parse_status = dot11f_unpack_ie_wpa(MAC_CONTEXT(mac_handle),
 						    rsn_ie, rsn_ie_len,
-						    &dot11WPAIE, false);
+						    &dot11_wpa_ie, false);
 		if (!DOT11F_SUCCEEDED(parse_status)) {
 			hdd_err("Invalid WPA IE: parse status %d",
 				parse_status);
@@ -5328,22 +5328,22 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
 		}
 		/* Copy out the encryption and authentication types */
 		hdd_debug("WPA unicast cipher suite count: %d",
-			 dot11WPAIE.unicast_cipher_count);
+			 dot11_wpa_ie.unicast_cipher_count);
 		hdd_debug("WPA authentication suite count: %d",
-			 dot11WPAIE.auth_suite_count);
-		/* dot11WPAIE.auth_suite_count */
+			 dot11_wpa_ie.auth_suite_count);
+		/* dot11_wpa_ie.auth_suite_count */
 		/* Just translate the FIRST one */
 		*pAuthType =
 			hdd_translate_wpa_to_csr_auth_type(
-					dot11WPAIE.auth_suites[0]);
-		/* dot11WPAIE.unicast_cipher_count */
+					dot11_wpa_ie.auth_suites[0]);
+		/* dot11_wpa_ie.unicast_cipher_count */
 		*pEncryptType =
 			hdd_translate_wpa_to_csr_encryption_type(
-					dot11WPAIE.unicast_ciphers[0]);
-		/* dot11WPAIE.unicast_cipher_count */
+					dot11_wpa_ie.unicast_ciphers[0]);
+		/* dot11_wpa_ie.unicast_cipher_count */
 		*mcEncryptType =
 			hdd_translate_wpa_to_csr_encryption_type(
-					dot11WPAIE.multicast_cipher);
+					dot11_wpa_ie.multicast_cipher);
 	} else {
 		hdd_warn("gen_ie[0]: %d", gen_ie[0]);
 		return -EINVAL;

+ 4 - 4
core/hdd/src/wlan_hdd_cfg80211.c

@@ -18573,12 +18573,12 @@ static int wlan_hdd_cfg80211_set_privacy_ibss(struct hdd_adapter *adapter,
 			sta_ctx->wpa_versions = NL80211_WPA_VERSION_2;
 			encryptionType = eCSR_ENCRYPT_TYPE_AES;
 		} else if (hdd_is_wpaie_present(params->ie, params->ie_len)) {
-			tDot11fIEWPA dot11WPAIE;
+			tDot11fIEWPA dot11_wpa_ie;
 			mac_handle_t mac_handle =
 				hdd_adapter_get_mac_handle(adapter);
 			const u8 *ie;
 
-			memset(&dot11WPAIE, 0, sizeof(dot11WPAIE));
+			memset(&dot11_wpa_ie, 0, sizeof(dot11_wpa_ie));
 			ie = wlan_get_ie_ptr_from_eid(DOT11F_EID_WPA,
 						params->ie, params->ie_len);
 			if (NULL != ie) {
@@ -18595,7 +18595,7 @@ static int wlan_hdd_cfg80211_set_privacy_ibss(struct hdd_adapter *adapter,
 				ret = dot11f_unpack_ie_wpa(
 						MAC_CONTEXT(mac_handle),
 						(uint8_t *)&ie[2 + 4],
-						ie[1] - 4, &dot11WPAIE, false);
+						ie[1] - 4, &dot11_wpa_ie, false);
 				if (DOT11F_FAILED(ret)) {
 					hdd_err("unpack failed ret: 0x%x", ret);
 					return -EINVAL;
@@ -18607,7 +18607,7 @@ static int wlan_hdd_cfg80211_set_privacy_ibss(struct hdd_adapter *adapter,
 				 */
 				encryptionType =
 					hdd_translate_wpa_to_csr_encryption_type
-						(dot11WPAIE.multicast_cipher);
+						(dot11_wpa_ie.multicast_cipher);
 			}
 		}
 

+ 13 - 13
core/hdd/src/wlan_hdd_hostapd.c

@@ -2694,7 +2694,7 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle,
 	uint8_t *rsn_ie;
 	uint16_t rsn_ie_len, i;
 	tDot11fIERSN dot11RSNIE = {0};
-	tDot11fIEWPA dot11WPAIE = {0};
+	tDot11fIEWPA dot11_wpa_ie = {0};
 
 	if (NULL == mac_handle) {
 		hdd_err("Error haHandle returned NULL");
@@ -2757,35 +2757,35 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle,
 		rsn_ie = gen_ie + 2 + 4;
 		rsn_ie_len = gen_ie_len - (2 + 4);
 		/* Unpack the WPA IE */
-		memset(&dot11WPAIE, 0, sizeof(tDot11fIEWPA));
+		memset(&dot11_wpa_ie, 0, sizeof(tDot11fIEWPA));
 		ret = dot11f_unpack_ie_wpa(MAC_CONTEXT(mac_handle),
 					   rsn_ie, rsn_ie_len,
-					   &dot11WPAIE, false);
+					   &dot11_wpa_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("WPA unicast cipher suite count: %d",
-		       dot11WPAIE.unicast_cipher_count);
+		       dot11_wpa_ie.unicast_cipher_count);
 		hdd_debug("WPA authentication suite count: %d",
-		       dot11WPAIE.auth_suite_count);
-		/* dot11WPAIE.auth_suite_count */
+		       dot11_wpa_ie.auth_suite_count);
+		/* dot11_wpa_ie.auth_suite_count */
 		/*
 		 * Translate akms in akm suite
 		 */
-		for (i = 0; i < dot11WPAIE.auth_suite_count; i++)
+		for (i = 0; i < dot11_wpa_ie.auth_suite_count; i++)
 			akm_list->authType[i] =
 				hdd_translate_wpa_to_csr_auth_type(
-						     dot11WPAIE.auth_suites[i]);
-		akm_list->numEntries = dot11WPAIE.auth_suite_count;
-		/* dot11WPAIE.unicast_cipher_count */
+						     dot11_wpa_ie.auth_suites[i]);
+		akm_list->numEntries = dot11_wpa_ie.auth_suite_count;
+		/* dot11_wpa_ie.unicast_cipher_count */
 		*pEncryptType =
-			hdd_translate_wpa_to_csr_encryption_type(dot11WPAIE.
+			hdd_translate_wpa_to_csr_encryption_type(dot11_wpa_ie.
 								 unicast_ciphers[0]);
-		/* dot11WPAIE.unicast_cipher_count */
+		/* dot11_wpa_ie.unicast_cipher_count */
 		*mcEncryptType =
-			hdd_translate_wpa_to_csr_encryption_type(dot11WPAIE.
+			hdd_translate_wpa_to_csr_encryption_type(dot11_wpa_ie.
 								 multicast_cipher);
 		*pMFPCapable = false;
 		*pMFPRequired = false;