staging: rtl8723bs: rename CamelCase variables in rtw_mlme.c
PATCH 1/1 staging: rtl8723bs: rename CamelCase variables in rtw_mlme.c
Rename several CamelCase variables to snake_case to comply with kernel coding style, as flagged by checkpatch.pl:
CHECK: Avoid CamelCase: <iEntry>
CHECK: Avoid CamelCase: <backupPMKIDList>
CHECK: Avoid CamelCase: <backupPMKIDIndex>
CHECK: Avoid CamelCase: <backupTKIPCountermeasure>
CHECK: Avoid CamelCase: <backupTKIPcountermeasure_time>
CHECK: Avoid CamelCase: <bHwLDPCSupport>
CHECK: Avoid CamelCase: <bHwSTBCSupport>
CHECK: Avoid CamelCase: <bHwSupportBeamformer>
CHECK: Avoid CamelCase: <bHwSupportBeamformee>
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 64 +++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +32 -32
@@ -1084,12 +1084,12 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netrtw_update_ht_cap (padapter, cur_network->network.ies, cur_network->network.ie_length, (u8 ) cur_network->network.configuration.ds_config); } -static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE ]; +static struct rt_pmkid_list backup_pmkid_list[NUM_PMKID_CACHE ];void rtw_reset_securitypriv (struct adapter *adapter) { -u8 backupPMKIDIndex =0 ; -u8 backupTKIPCountermeasure =0x00 ; -u32 backupTKIPcountermeasure_time =0 ; +u8 backup_pmkid_index =0 ; +u8 backup_tkip_countermeasure =0x00 ; +u32 backup_tkip_countermeasure_time =0 ;/* add for CONFIG_IEEE80211W, none 11w also can use */ struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
@@ -1103,10 +1103,10 @@ void rtw_reset_securitypriv(struct adapter *adapter)/* Backup the btkip_countermeasure information. */ /* When the countermeasure is trigger, the driver have to disconnect with AP for 60 seconds. */ -memcpy (&backupPMKIDList[0 ], &adapter->securitypriv.PMKIDList[0 ],sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); - backupPMKIDIndex = adapter->securitypriv.PMKIDIndex; - backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure; - backupTKIPcountermeasure_time = adapter->securitypriv.btkip_countermeasure_time; +memcpy (&backup_pmkid_list[0 ], &adapter->securitypriv.PMKIDList[0 ],sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); + backup_pmkid_index = adapter->securitypriv.PMKIDIndex; + backup_tkip_countermeasure = adapter->securitypriv.btkip_countermeasure; + backup_tkip_countermeasure_time = adapter->securitypriv.btkip_countermeasure_time;/* reset RX BIP packet number */ pmlmeext->mgnt_80211w_IPN_rx =0 ;
@@ -1115,10 +1115,10 @@ void rtw_reset_securitypriv(struct adapter *adapter)/* Added by Albert 2009/02/18 */ /* Restore the PMK information to securitypriv structure for the following connection. */ -memcpy (&adapter->securitypriv.PMKIDList[0 ], &backupPMKIDList[0 ],sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); - adapter->securitypriv.PMKIDIndex = backupPMKIDIndex; - adapter->securitypriv.btkip_countermeasure = backupTKIPCountermeasure; - adapter->securitypriv.btkip_countermeasure_time = backupTKIPcountermeasure_time; +memcpy (&adapter->securitypriv.PMKIDList[0 ], &backup_pmkid_list[0 ],sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); + adapter->securitypriv.PMKIDIndex = backup_pmkid_index; + adapter->securitypriv.btkip_countermeasure = backup_tkip_countermeasure; + adapter->securitypriv.btkip_countermeasure_time = backup_tkip_countermeasure_time; adapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled;
@@ -2019,7 +2019,7 @@ static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid)/* 13th element in the array is the IE length */ /* */ -static int rtw_append_pmkid (struct adapter *Adapter,int iEntry,u8 *ie,uint ie_len) +static int rtw_append_pmkid (struct adapter *Adapter,int pmkid_idx,u8 *ie,uint ie_len) {struct security_priv *psecuritypriv = &Adapter->securitypriv;
@@ -2029,7 +2029,7 @@ static int rtw_append_pmkid(struct adapter *Adapter, int iEntry, u8 *ie, uint ie ie_len++; ie[ie_len] =0 ;/* PMKID count = 0x0100 */ ie_len++; -memcpy (&ie[ie_len], &psecuritypriv->PMKIDList[iEntry].PMKID,16 ); +memcpy (&ie[ie_len], &psecuritypriv->PMKIDList[pmkid_idx].PMKID,16 ); ie_len +=16 ; ie[13 ] +=18 ;/* PMKID length = 2+16 */ }
@@ -2073,7 +2073,7 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u {u8 authmode =0x0 ;uint ielength; -int iEntry; +int pmkid_idx;struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct security_priv *psecuritypriv = &adapter->securitypriv;
@@ -2098,12 +2098,12 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, urtw_report_sec_ie (adapter, authmode, psecuritypriv->supplicant_ie); } - iEntry =SecIsInPMKIDList (adapter, pmlmepriv->assoc_bssid); -if (iEntry <0 ) + pmkid_idx =SecIsInPMKIDList (adapter, pmlmepriv->assoc_bssid); +if (pmkid_idx <0 )return ielength;if (authmode ==WLAN_EID_RSN ) - ielength =rtw_append_pmkid (adapter, iEntry, out_ie, ielength); + ielength =rtw_append_pmkid (adapter, pmkid_idx, out_ie, ielength);return ielength; }
@@ -2207,8 +2207,8 @@ void rtw_ht_use_default_setting(struct adapter *padapter)struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct ht_priv *phtpriv = &pmlmepriv->htpriv;struct registry_priv *pregistrypriv = &padapter->registrypriv; -bool bHwLDPCSupport = false, bHwSTBCSupport = false; -bool bHwSupportBeamformer = false, bHwSupportBeamformee = false; +bool hw_ldpc_support = false, hw_stbc_support = false; +bool hw_support_beamformer = false, hw_support_beamformee = false;if (pregistrypriv->wifi_spec) phtpriv->bss_coexist =1 ;
@@ -2219,39 +2219,39 @@ void rtw_ht_use_default_setting(struct adapter *padapter) phtpriv->sgi_20m =TEST_FLAG (pregistrypriv->short_gi,BIT (0 )) ? true : false;/* LDPC support */ -rtw_hal_get_def_var (padapter,HAL_DEF_RX_LDPC , (u8 *)&bHwLDPCSupport); +rtw_hal_get_def_var (padapter,HAL_DEF_RX_LDPC , (u8 *)&hw_ldpc_support);CLEAR_FLAGS (phtpriv->ldpc_cap); -if (bHwLDPCSupport) { +if (hw_ldpc_support) {if (TEST_FLAG (pregistrypriv->ldpc_cap,BIT (4 )))SET_FLAG (phtpriv->ldpc_cap,LDPC_HT_ENABLE_RX ); } -rtw_hal_get_def_var (padapter,HAL_DEF_TX_LDPC , (u8 *)&bHwLDPCSupport); -if (bHwLDPCSupport) { +rtw_hal_get_def_var (padapter,HAL_DEF_TX_LDPC , (u8 *)&hw_ldpc_support); +if (hw_ldpc_support) {if (TEST_FLAG (pregistrypriv->ldpc_cap,BIT (5 )))SET_FLAG (phtpriv->ldpc_cap,LDPC_HT_ENABLE_TX ); }/* STBC */ -rtw_hal_get_def_var (padapter,HAL_DEF_TX_STBC , (u8 *)&bHwSTBCSupport); +rtw_hal_get_def_var (padapter,HAL_DEF_TX_STBC , (u8 *)&hw_stbc_support);CLEAR_FLAGS (phtpriv->stbc_cap); -if (bHwSTBCSupport) { +if (hw_stbc_support) {if (TEST_FLAG (pregistrypriv->stbc_cap,BIT (5 )))SET_FLAG (phtpriv->stbc_cap,STBC_HT_ENABLE_TX ); } -rtw_hal_get_def_var (padapter,HAL_DEF_RX_STBC , (u8 *)&bHwSTBCSupport); -if (bHwSTBCSupport) { +rtw_hal_get_def_var (padapter,HAL_DEF_RX_STBC , (u8 *)&hw_stbc_support); +if (hw_stbc_support) {if (TEST_FLAG (pregistrypriv->stbc_cap,BIT (4 )))SET_FLAG (phtpriv->stbc_cap,STBC_HT_ENABLE_RX ); }/* Beamforming setting */ -rtw_hal_get_def_var (padapter,HAL_DEF_EXPLICIT_BEAMFORMER , (u8 *)&bHwSupportBeamformer); -rtw_hal_get_def_var (padapter,HAL_DEF_EXPLICIT_BEAMFORMEE , (u8 *)&bHwSupportBeamformee); +rtw_hal_get_def_var (padapter,HAL_DEF_EXPLICIT_BEAMFORMER , (u8 *)&hw_support_beamformer); +rtw_hal_get_def_var (padapter,HAL_DEF_EXPLICIT_BEAMFORMEE , (u8 *)&hw_support_beamformee);CLEAR_FLAGS (phtpriv->beamform_cap); -if (TEST_FLAG (pregistrypriv->beamform_cap,BIT (4 )) && bHwSupportBeamformer) +if (TEST_FLAG (pregistrypriv->beamform_cap,BIT (4 )) && hw_support_beamformer)SET_FLAG (phtpriv->beamform_cap,BEAMFORMING_HT_BEAMFORMER_ENABLE ); -if (TEST_FLAG (pregistrypriv->beamform_cap,BIT (5 )) && bHwSupportBeamformee) +if (TEST_FLAG (pregistrypriv->beamform_cap,BIT (5 )) && hw_support_beamformee)SET_FLAG (phtpriv->beamform_cap,BEAMFORMING_HT_BEAMFORMEE_ENABLE ); }
Signature · 1 line
2.43.0
Greg KH
maintainerQuoted 12 lines · Hank Yang
Rename several CamelCase variables to
snake_caseto comply with kernel coding style, as flagged by checkpatch.pl:
CHECK: Avoid CamelCase: <iEntry>
CHECK: Avoid CamelCase: <backupPMKIDList>
CHECK: Avoid CamelCase: <backupPMKIDIndex>
CHECK: Avoid CamelCase: <backupTKIPCountermeasure>
CHECK: Avoid CamelCase: <backupTKIPcountermeasure_time>
CHECK: Avoid CamelCase: <bHwLDPCSupport>
CHECK: Avoid CamelCase: <bHwSTBCSupport>
CHECK: Avoid CamelCase: <bHwSupportBeamformer>
CHECK: Avoid CamelCase: <bHwSupportBeamformee>
Quoted 3 lines
Signed-off-by Hank Yang <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 64 +++++++++++------------
Does not apply to the staging-testing branch, can you rebase and resend?
thanks,
greg k-h