A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 00:24:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Rename struct hdd_wapi_info fields

Browse source 
Per the Linux coding style "mixed-case names are frowned upon" so
rename all fields in struct hdd_wapi_info.

Change-Id: I7df5a9523d00186f8b40de81c8544c0c1dc56b69
CRs-Fixed: 2137220
This commit is contained in:
Jeff Johnson 2017-11-02 09:25:45 -07:00
commit 7d2f4c689f
4 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/hdd/inc/wlan_hdd_main.h
View file

@ -547,14 +547,14 @@ enum wapi_auth_mode {
/**
* struct hdd_wapi_info - WAPI Information structure definition
* @nWapiMode: Is WAPI enabled on this adapter?
* @fIsWapiSta: Is the STA associated with WAPI?
* @wapiAuthMode: WAPI authentication mode used by this adapter
* @wapi_mode: Is WAPI enabled on this adapter?
* @is_wapi_sta: Is the STA associated with WAPI?
* @wapi_auth_mode: WAPI authentication mode used by this adapter
*/
struct hdd_wapi_info {
uint32_t nWapiMode;
bool fIsWapiSta;
uint8_t wapiAuthMode;
bool wapi_mode;
bool is_wapi_sta;
enum wapi_auth_mode wapi_auth_mode;
};
#endif /* FEATURE_WLAN_WAPI */

8
core/hdd/src/wlan_hdd_assoc.c
View file

@ -1946,8 +1946,8 @@ QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
#ifdef FEATURE_WLAN_WAPI
hdd_debug("WAPI STA Registered: %d",
adapter->wapi_info.fIsWapiSta);
if (adapter->wapi_info.fIsWapiSta)
adapter->wapi_info.is_wapi_sta);
if (adapter->wapi_info.is_wapi_sta)
staDesc.is_wapi_supported = 1;
else
staDesc.is_wapi_supported = 0;
@ -2628,9 +2628,9 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
eCSR_AUTH_TYPE_WAPI_WAI_CERTIFICATE
|| roam_info->u.pConnectedProfile->AuthType ==
eCSR_AUTH_TYPE_WAPI_WAI_PSK) {
adapter->wapi_info.fIsWapiSta = 1;
adapter->wapi_info.is_wapi_sta = true;
} else {
adapter->wapi_info.fIsWapiSta = 0;
adapter->wapi_info.is_wapi_sta = false;
}
#endif /* FEATURE_WLAN_WAPI */
hdd_debug("bss_descr[%d] devicemode[%d]", !!roam_info->pBssDesc,

22
core/hdd/src/wlan_hdd_cfg80211.c
View file

@ -15796,13 +15796,13 @@ static int wlan_hdd_cfg80211_connect_start(struct hdd_adapter *adapter,
hdd_set_csr_auth_type(adapter, RSNAuthType);
}
#ifdef FEATURE_WLAN_WAPI
if (adapter->wapi_info.nWapiMode) {
if (adapter->wapi_info.wapi_mode) {
hdd_debug("Setting WAPI AUTH Type and Encryption Mode values");
switch (adapter->wapi_info.wapiAuthMode) {
switch (adapter->wapi_info.wapi_auth_mode) {
case WAPI_AUTH_MODE_PSK:
{
hdd_debug("WAPI AUTH TYPE: PSK: %d",
adapter->wapi_info.wapiAuthMode);
adapter->wapi_info.wapi_auth_mode);
roam_profile->AuthType.authType[0] =
eCSR_AUTH_TYPE_WAPI_WAI_PSK;
break;
@ -15810,15 +15810,17 @@ static int wlan_hdd_cfg80211_connect_start(struct hdd_adapter *adapter,
case WAPI_AUTH_MODE_CERT:
{
hdd_debug("WAPI AUTH TYPE: CERT: %d",
adapter->wapi_info.wapiAuthMode);
adapter->wapi_info.wapi_auth_mode);
roam_profile->AuthType.authType[0] =
eCSR_AUTH_TYPE_WAPI_WAI_CERTIFICATE;
break;
}
default:
break;
} /* End of switch */
if (adapter->wapi_info.wapiAuthMode ==
if (adapter->wapi_info.wapi_auth_mode ==
WAPI_AUTH_MODE_PSK
|| adapter->wapi_info.wapiAuthMode ==
|| adapter->wapi_info.wapi_auth_mode ==
WAPI_AUTH_MODE_CERT) {
hdd_debug("WAPI PAIRWISE/GROUP ENCRYPTION: WPI");
roam_profile->AuthType.numEntries = 1;
@ -16811,8 +16813,8 @@ static int wlan_hdd_cfg80211_set_ie(struct hdd_adapter *adapter,
#ifdef FEATURE_WLAN_WAPI
case WLAN_EID_WAPI:
/* Setting WAPI Mode to ON=1 */
adapter->wapi_info.nWapiMode = 1;
hdd_debug("WAPI MODE IS %u", adapter->wapi_info.nWapiMode);
adapter->wapi_info.wapi_mode = true;
hdd_debug("WAPI MODE IS %u", adapter->wapi_info.wapi_mode);
tmp = (u16 *) ie;
tmp = tmp + 2; /* Skip element Id and Len, Version */
akmsuiteCount = WPA_GET_LE16(tmp);
@ -16829,12 +16831,12 @@ static int wlan_hdd_cfg80211_set_ie(struct hdd_adapter *adapter,
if (WAPI_PSK_AKM_SUITE == akmsuite[0]) {
hdd_debug("WAPI AUTH MODE SET TO PSK");
adapter->wapi_info.wapiAuthMode =
adapter->wapi_info.wapi_auth_mode =
WAPI_AUTH_MODE_PSK;
}
if (WAPI_CERT_AKM_SUITE == akmsuite[0]) {
hdd_debug("WAPI AUTH MODE SET TO CERTIFICATE");
adapter->wapi_info.wapiAuthMode =
adapter->wapi_info.wapi_auth_mode =
WAPI_AUTH_MODE_CERT;
}
break;

4
core/hdd/src/wlan_hdd_wext.c
View file

@ -4195,8 +4195,8 @@ void hdd_clear_roam_profile_ie(struct hdd_adapter *adapter)
qdf_mem_zero(pWextState->roamProfile.Keys.KeyLength, CSR_MAX_NUM_KEY);
#ifdef FEATURE_WLAN_WAPI
adapter->wapi_info.wapiAuthMode = WAPI_AUTH_MODE_OPEN;
adapter->wapi_info.nWapiMode = 0;
adapter->wapi_info.wapi_auth_mode = WAPI_AUTH_MODE_OPEN;
adapter->wapi_info.wapi_mode = false;
#endif
sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);