Browse Source

qcacld-3.0: Rename authType in struct hdd_connection_info

The Linux Coding Style frowns upon mixed-case names so rename field
authType in struct hdd_connection_info to be compliant.

Change-Id: I6b17fd1b068a817ad4ef2eed99164a4c4620b50b
CRs-Fixed: 2409881
Jeff Johnson 6 năm trước cách đây
mục cha
commit
96e3351707

+ 2 - 2
core/hdd/inc/wlan_hdd_assoc.h

@@ -143,7 +143,7 @@ struct hdd_conn_flag {
  * @SSID: SSID Info
  * @staid: Station ID
  * @peer_macaddr:Peer Mac Address of the IBSS Stations
- * @authType: Auth Type
+ * @auth_type: Auth Type
  * @uc_encrypt_type: Unicast Encryption Type
  * @mc_encrypt_type: Multicast Encryption Type
  * @Keys: Keys
@@ -178,7 +178,7 @@ struct hdd_connection_info {
 	tCsrSSIDInfo ssid;
 	uint8_t staid[MAX_PEERS];
 	struct qdf_mac_addr peer_macaddr[MAX_PEERS];
-	eCsrAuthType authType;
+	eCsrAuthType auth_type;
 	eCsrEncryptionType uc_encrypt_type;
 	eCsrEncryptionType mc_encrypt_type;
 	tCsrKeys Keys;

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

@@ -1011,10 +1011,10 @@ hdd_conn_save_connect_info(struct hdd_adapter *adapter,
 				roam_info->u.pConnectedProfile->EncryptionType;
 			sta_ctx->conn_info.uc_encrypt_type = encryptType;
 
-			sta_ctx->conn_info.authType =
+			sta_ctx->conn_info.auth_type =
 				roam_info->u.pConnectedProfile->AuthType;
 			sta_ctx->conn_info.last_auth_type =
-				sta_ctx->conn_info.authType;
+				sta_ctx->conn_info.auth_type;
 
 			sta_ctx->conn_info.operationChannel =
 			    roam_info->u.pConnectedProfile->operationChannel;
@@ -1540,7 +1540,7 @@ static void hdd_conn_remove_connect_info(struct hdd_station_ctx *sta_ctx)
 		     QDF_MAC_ADDR_SIZE);
 
 	/* Clear all security settings */
-	sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_OPEN_SYSTEM;
+	sta_ctx->conn_info.auth_type = eCSR_AUTH_TYPE_OPEN_SYSTEM;
 	sta_ctx->conn_info.mc_encrypt_type = eCSR_ENCRYPT_TYPE_NONE;
 	sta_ctx->conn_info.uc_encrypt_type = eCSR_ENCRYPT_TYPE_NONE;
 
@@ -4558,7 +4558,7 @@ static inline bool
 hdd_is_8021x_sha256_auth_type(struct hdd_station_ctx *sta_ctx)
 {
 	return eCSR_AUTH_TYPE_RSN_8021X_SHA256 ==
-				sta_ctx->conn_info.authType;
+				sta_ctx->conn_info.auth_type;
 }
 #else
 static inline bool
@@ -4839,7 +4839,7 @@ hdd_sme_roam_callback(void *pContext, struct csr_roam_info *roam_info,
 		break;
 
 	case eCSR_ROAM_PMK_NOTIFY:
-		if (eCSR_AUTH_TYPE_RSN == sta_ctx->conn_info.authType
+		if (eCSR_AUTH_TYPE_RSN == sta_ctx->conn_info.auth_type
 				|| hdd_is_8021x_sha256_auth_type(sta_ctx)) {
 			/* notify the supplicant of a new candidate */
 			qdf_ret_status =
@@ -4908,9 +4908,9 @@ hdd_sme_roam_callback(void *pContext, struct csr_roam_info *roam_info,
 	case eCSR_ROAM_CCKM_PREAUTH_NOTIFY:
 	{
 		if (eCSR_AUTH_TYPE_CCKM_WPA ==
-		    sta_ctx->conn_info.authType
+		    sta_ctx->conn_info.auth_type
 		    || eCSR_AUTH_TYPE_CCKM_RSN ==
-		    sta_ctx->conn_info.authType) {
+		    sta_ctx->conn_info.auth_type) {
 			hdd_indicate_cckm_pre_auth(adapter, roam_info);
 		}
 		break;
@@ -5551,11 +5551,11 @@ int hdd_set_csr_auth_type(struct hdd_adapter *adapter,
 
 	roam_profile = hdd_roam_profile(adapter);
 	roam_profile->AuthType.numEntries = 1;
-	hdd_debug("authType = %d RSNAuthType %d wpa_versions %d",
-		  sta_ctx->conn_info.authType, RSNAuthType,
+	hdd_debug("auth_type = %d RSNAuthType %d wpa_versions %d",
+		  sta_ctx->conn_info.auth_type, RSNAuthType,
 		  sta_ctx->wpa_versions);
 
-	switch (sta_ctx->conn_info.authType) {
+	switch (sta_ctx->conn_info.auth_type) {
 	case eCSR_AUTH_TYPE_OPEN_SYSTEM:
 	case eCSR_AUTH_TYPE_AUTOSWITCH:
 #ifdef FEATURE_WLAN_ESE

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

@@ -14571,7 +14571,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 		    !((HDD_AUTH_KEY_MGMT_802_1X ==
 		       (sta_ctx->auth_key_mgmt & HDD_AUTH_KEY_MGMT_802_1X))
 		      && (eCSR_AUTH_TYPE_OPEN_SYSTEM ==
-			  sta_ctx->conn_info.authType)
+			  sta_ctx->conn_info.auth_type)
 		      )
 		    && ((WLAN_CIPHER_SUITE_WEP40 == params->cipher)
 			|| (WLAN_CIPHER_SUITE_WEP104 == params->cipher)
@@ -16146,23 +16146,23 @@ static int wlan_hdd_cfg80211_set_auth_type(struct hdd_adapter *adapter,
 	switch (auth_type) {
 	case NL80211_AUTHTYPE_AUTOMATIC:
 		hdd_debug("set authentication type to AUTOSWITCH");
-		sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_AUTOSWITCH;
+		sta_ctx->conn_info.auth_type = eCSR_AUTH_TYPE_AUTOSWITCH;
 		break;
 
 	case NL80211_AUTHTYPE_OPEN_SYSTEM:
 	case NL80211_AUTHTYPE_FT:
 		hdd_debug("set authentication type to OPEN");
-		sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_OPEN_SYSTEM;
+		sta_ctx->conn_info.auth_type = eCSR_AUTH_TYPE_OPEN_SYSTEM;
 		break;
 
 	case NL80211_AUTHTYPE_SHARED_KEY:
 		hdd_debug("set authentication type to SHARED");
-		sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_SHARED_KEY;
+		sta_ctx->conn_info.auth_type = eCSR_AUTH_TYPE_SHARED_KEY;
 		break;
 #ifdef FEATURE_WLAN_ESE
 	case NL80211_AUTHTYPE_NETWORK_EAP:
 		hdd_debug("set authentication type to CCKM WPA");
-		sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_CCKM_WPA;
+		sta_ctx->conn_info.auth_type = eCSR_AUTH_TYPE_CCKM_WPA;
 		break;
 #endif
 #if defined(WLAN_FEATURE_FILS_SK) && \
@@ -16170,21 +16170,21 @@ static int wlan_hdd_cfg80211_set_auth_type(struct hdd_adapter *adapter,
 		 (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)))
 	case NL80211_AUTHTYPE_FILS_SK:
 		hdd_debug("set authentication type to FILS SHARED");
-		sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_OPEN_SYSTEM;
+		sta_ctx->conn_info.auth_type = eCSR_AUTH_TYPE_OPEN_SYSTEM;
 		break;
 #endif
 	case NL80211_AUTHTYPE_SAE:
 		hdd_debug("set authentication type to SAE");
-		sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_SAE;
+		sta_ctx->conn_info.auth_type = eCSR_AUTH_TYPE_SAE;
 		break;
 	default:
 		hdd_err("Unsupported authentication type: %d", auth_type);
-		sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_UNKNOWN;
+		sta_ctx->conn_info.auth_type = eCSR_AUTH_TYPE_UNKNOWN;
 		return -EINVAL;
 	}
 
 	roam_profile = hdd_roam_profile(adapter);
-	roam_profile->AuthType.authType[0] = sta_ctx->conn_info.authType;
+	roam_profile->AuthType.authType[0] = sta_ctx->conn_info.auth_type;
 	return 0;
 }
 
@@ -17472,7 +17472,7 @@ static void wlan_hdd_cfg80211_clear_privacy(struct hdd_adapter *adapter)
 
 	hdd_sta_ctx->wpa_versions = 0;
 
-	hdd_sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_NONE;
+	hdd_sta_ctx->conn_info.auth_type = eCSR_AUTH_TYPE_NONE;
 	hdd_sta_ctx->roam_profile.AuthType.authType[0] = eCSR_AUTH_TYPE_NONE;
 
 	hdd_sta_ctx->conn_info.uc_encrypt_type = eCSR_ENCRYPT_TYPE_NONE;
@@ -18334,7 +18334,7 @@ static int wlan_hdd_cfg80211_set_privacy_ibss(struct hdd_adapter *adapter,
 
 	roam_profile = hdd_roam_profile(adapter);
 	roam_profile->AuthType.authType[0] =
-		sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_OPEN_SYSTEM;
+		sta_ctx->conn_info.auth_type = eCSR_AUTH_TYPE_OPEN_SYSTEM;
 
 	if (params->privacy) {
 		/* Security enabled IBSS, At this time there is no information

+ 1 - 1
core/hdd/src/wlan_hdd_main.c

@@ -4316,7 +4316,7 @@ QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
 		hdd_ctx->config->operating_channel;
 
 	/* Make the default Auth Type as OPEN */
-	sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_OPEN_SYSTEM;
+	sta_ctx->conn_info.auth_type = eCSR_AUTH_TYPE_OPEN_SYSTEM;
 
 	status = hdd_init_tx_rx(adapter);
 	if (QDF_STATUS_SUCCESS != status) {