samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Rename *EncryptionType in struct hdd_connection_info

Browse Source 
The Linux Coding Style frowns upon mixed-case names so rename fields
ucEncryptionType and mcEncryptionType in struct hdd_connection_info to
be compliant.

Change-Id: I286b7df320f4bb1684acaf463cfd249dc0e1c1d8
CRs-Fixed: 2409876
This commit is contained in:
Jeff Johnson
2019-02-27 13:04:04 -08:00
committed by nshrivas
parent ac5170c4a7
commit b195984a0e
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/hdd/inc/wlan_hdd_assoc.h
View File

@@ -144,8 +144,8 @@ struct hdd_conn_flag {
* @staId: Station ID
* @peerMacAddress:Peer Mac Address of the IBSS Stations
* @authType: Auth Type
* @ucEncryptionType: Unicast Encryption Type
* @mcEncryptionType: Multicast Encryption Type
* @uc_encrypt_type: Unicast Encryption Type
* @mc_encrypt_type: Multicast Encryption Type
* @Keys: Keys
* @operationChannel: Operation Channel
* @uIsAuthenticated: Remembers authenticated state
@@ -179,8 +179,8 @@ struct hdd_connection_info {
uint8_t staId[MAX_PEERS];
struct qdf_mac_addr peerMacAddress[MAX_PEERS];
eCsrAuthType authType;
eCsrEncryptionType ucEncryptionType;
eCsrEncryptionType mcEncryptionType;
eCsrEncryptionType uc_encrypt_type;
eCsrEncryptionType mc_encrypt_type;
tCsrKeys Keys;
uint8_t operationChannel;
uint8_t uIsAuthenticated;

12
core/hdd/src/wlan_hdd_assoc.c
View File

@@ -363,7 +363,7 @@ hdd_conn_get_connected_cipher_algo(struct hdd_station_ctx *sta_ctx,
connected = hdd_conn_get_connection_state(sta_ctx, NULL);
if (pConnectedCipherAlgo)
*pConnectedCipherAlgo = sta_ctx->conn_info.ucEncryptionType;
*pConnectedCipherAlgo = sta_ctx->conn_info.uc_encrypt_type;
return connected;
}
@@ -1005,11 +1005,11 @@ hdd_conn_save_connect_info(struct hdd_adapter *adapter,
/* Get Multicast Encryption Type */
encryptType =
roam_info->u.pConnectedProfile->mcEncryptionType;
sta_ctx->conn_info.mcEncryptionType = encryptType;
sta_ctx->conn_info.mc_encrypt_type = encryptType;
/* Get Unicast Encryption Type */
encryptType =
roam_info->u.pConnectedProfile->EncryptionType;
sta_ctx->conn_info.ucEncryptionType = encryptType;
sta_ctx->conn_info.uc_encrypt_type = encryptType;
sta_ctx->conn_info.authType =
roam_info->u.pConnectedProfile->AuthType;
@@ -1541,8 +1541,8 @@ static void hdd_conn_remove_connect_info(struct hdd_station_ctx *sta_ctx)
/* Clear all security settings */
sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_OPEN_SYSTEM;
sta_ctx->conn_info.mcEncryptionType = eCSR_ENCRYPT_TYPE_NONE;
sta_ctx->conn_info.ucEncryptionType = eCSR_ENCRYPT_TYPE_NONE;
sta_ctx->conn_info.mc_encrypt_type = eCSR_ENCRYPT_TYPE_NONE;
sta_ctx->conn_info.uc_encrypt_type = eCSR_ENCRYPT_TYPE_NONE;
qdf_mem_zero(&sta_ctx->conn_info.Keys, sizeof(tCsrKeys));
qdf_mem_zero(&sta_ctx->ibss_enc_key, sizeof(tCsrRoamSetKey));
@@ -2566,7 +2566,7 @@ static void hdd_change_peer_state_after_set_key(struct hdd_adapter *adapter,
{
struct hdd_station_ctx *hdd_sta_ctx =
WLAN_HDD_GET_STATION_CTX_PTR(adapter);
eCsrEncryptionType encr_type = hdd_sta_ctx->conn_info.ucEncryptionType;
eCsrEncryptionType encr_type = hdd_sta_ctx->conn_info.uc_encrypt_type;
/*
* If the security mode is one of the following, IBSS peer will be

26
core/hdd/src/wlan_hdd_cfg80211.c
View File

@@ -14807,15 +14807,15 @@ static int wlan_hdd_cfg80211_del_key(struct wiphy *wiphy,
#ifndef CRYPTO_SET_KEY_CONVERGED
#ifdef FEATURE_WLAN_WAPI
static bool hdd_is_wapi_enc_type(eCsrEncryptionType ucEncryptionType)
static bool hdd_is_wapi_enc_type(eCsrEncryptionType encrypt_type)
{
if (ucEncryptionType == eCSR_ENCRYPT_TYPE_WPI)
if (encrypt_type == eCSR_ENCRYPT_TYPE_WPI)
return true;
return false;
}
#else
static bool hdd_is_wapi_enc_type(eCsrEncryptionType ucEncryptionType)
static bool hdd_is_wapi_enc_type(eCsrEncryptionType encrypt_type)
{
return false;
}
@@ -14944,15 +14944,15 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
roam_profile = hdd_roam_profile(adapter);
if ((eCSR_ENCRYPT_TYPE_TKIP !=
sta_ctx->conn_info.ucEncryptionType) &&
sta_ctx->conn_info.uc_encrypt_type) &&
!hdd_is_wapi_enc_type(
sta_ctx->conn_info.ucEncryptionType) &&
sta_ctx->conn_info.uc_encrypt_type) &&
(eCSR_ENCRYPT_TYPE_AES !=
sta_ctx->conn_info.ucEncryptionType) &&
sta_ctx->conn_info.uc_encrypt_type) &&
(eCSR_ENCRYPT_TYPE_AES_GCMP !=
sta_ctx->conn_info.ucEncryptionType) &&
sta_ctx->conn_info.uc_encrypt_type) &&
(eCSR_ENCRYPT_TYPE_AES_GCMP_256 !=
sta_ctx->conn_info.ucEncryptionType)) {
sta_ctx->conn_info.uc_encrypt_type)) {
/* If default key index is not same as previous one,
* then update the default key index
*/
@@ -16615,13 +16615,13 @@ static int wlan_hdd_cfg80211_set_cipher(struct hdd_adapter *adapter,
roam_profile = hdd_roam_profile(adapter);
if (ucast) {
hdd_debug("setting unicast cipher type to %d", encryptionType);
sta_ctx->conn_info.ucEncryptionType = encryptionType;
sta_ctx->conn_info.uc_encrypt_type = encryptionType;
roam_profile->EncryptionType.numEntries = 1;
roam_profile->EncryptionType.encryptionType[0] =
encryptionType;
} else {
hdd_debug("setting mcast cipher type to %d", encryptionType);
sta_ctx->conn_info.mcEncryptionType = encryptionType;
sta_ctx->conn_info.mc_encrypt_type = encryptionType;
roam_profile->mcEncryptionType.numEntries = 1;
roam_profile->mcEncryptionType.encryptionType[0] =
encryptionType;
@@ -17475,9 +17475,9 @@ static void wlan_hdd_cfg80211_clear_privacy(struct hdd_adapter *adapter)
hdd_sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_NONE;
hdd_sta_ctx->roam_profile.AuthType.authType[0] = eCSR_AUTH_TYPE_NONE;
hdd_sta_ctx->conn_info.ucEncryptionType = eCSR_ENCRYPT_TYPE_NONE;
hdd_sta_ctx->conn_info.uc_encrypt_type = eCSR_ENCRYPT_TYPE_NONE;
hdd_sta_ctx->roam_profile.EncryptionType.numEntries = 0;
hdd_sta_ctx->conn_info.mcEncryptionType = eCSR_ENCRYPT_TYPE_NONE;
hdd_sta_ctx->conn_info.mc_encrypt_type = eCSR_ENCRYPT_TYPE_NONE;
hdd_sta_ctx->roam_profile.mcEncryptionType.numEntries = 0;
wlan_hdd_clear_wapi_privacy(adapter);
@@ -18348,7 +18348,7 @@ static int wlan_hdd_cfg80211_set_privacy_ibss(struct hdd_adapter *adapter,
encryptionType = eCSR_ENCRYPT_TYPE_WEP40_STATICKEY;
}
hdd_debug("encryptionType=%d", encryptionType);
sta_ctx->conn_info.ucEncryptionType = encryptionType;
sta_ctx->conn_info.uc_encrypt_type = encryptionType;
roam_profile->EncryptionType.numEntries = 1;
roam_profile->EncryptionType.encryptionType[0] =
encryptionType;