staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm
PATCH 1/1 staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm
Rename variable dot11AuthAlgrthm to dot11_auth_algrthm in struct security_priv to resolve checkpatch.pl CamelCase finding.
Signed-off-by Dalvin-Ehinoma Noah Aiguobas <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 8 ++--- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 12 +++---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- .../staging/rtl8723bs/include/rtw_security.h | 4 +-- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 32 +++++++++---------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 11 files changed, 35 insertions(+), 35 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +4 -4
@@ -447,7 +447,7 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)/* ap mode */ rtw_hal_set_odm_var (padapter,HAL_ODM_STA_INFO , psta, true); -if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) +if (psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_8021X) psta->ieee8021x_blocked = true;else psta->ieee8021x_blocked = false;
@@ -673,7 +673,7 @@ void start_bss_network(struct adapter *padapter)rtw_hal_set_hwreg (padapter,HW_VAR_AC_PARAM_BK , (u8 *)(&acparm));/* Set Security */ - val8 = (psecuritypriv->dot11AuthAlgrthm == + val8 = (psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_8021X) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));
@@ -872,7 +872,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) { - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; psecuritypriv->dot8021xalg =1 ;/* psk, todo:802.1x */ psecuritypriv->wpa_psk |=BIT (1 );
@@ -898,7 +898,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) { - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; psecuritypriv->dot8021xalg =1 ;/* psk, todo:802.1x */
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -1
@@ -400,7 +400,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11 psecuritypriv->ndisauthtype = authmode;if (psecuritypriv->ndisauthtype >3 ) - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; res =rtw_set_auth (padapter, psecuritypriv);
drivers/staging/rtl8723bs/core/rtw_mlme.c +6 -6
@@ -969,7 +969,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, strrtw_hal_set_odm_var (padapter,HAL_ODM_STA_INFO , psta, true);/* security related */ -if (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { +if (padapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) { padapter->securitypriv.binstallGrpkey = false; padapter->securitypriv.busetkipkey = false; padapter->securitypriv.bgrpkey_handshake = false;
@@ -1080,7 +1080,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)spin_lock_bh (&adapter->security_key_mutex); -if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { +if (adapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) {/* 802.1x */ /* Added by Albert 2009/02/18 */ /* We have to backup the PMK information for WiFi PMK Caching test item. */
@@ -1114,7 +1114,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)/* */ struct security_priv *psec_priv = &adapter->securitypriv; - psec_priv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;/* open system */ + psec_priv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ psec_priv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psec_priv->dot11PrivacyKeyIndex =0 ;
@@ -1330,7 +1330,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)rtw_sta_media_status_rpt (adapter, psta,1 ); -if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) +if (adapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm; psta->ieee8021x_blocked = false;
@@ -1853,7 +1853,7 @@ signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecurity goto exit; } - psetauthparm->mode = (unsigned char )psecuritypriv->dot11AuthAlgrthm; + psetauthparm->mode = (unsigned char )psecuritypriv->dot11_auth_algrthm; pcmd->cmdcode = _SetAuth_CMD_; pcmd->parmbuf = (unsigned char *)psetauthparm;
@@ -1883,7 +1883,7 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp goto exit; } -if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) +if (psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_8021X) psetkeyparm->algorithm = (unsigned char )psecuritypriv->dot118021XGrpPrivacy;else psetkeyparm->algorithm = (u8 )psecuritypriv->dot11PrivacyAlgrthm;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -679,7 +679,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) sa =GetAddr2Ptr (pframe); - auth_mode = psecuritypriv->dot11AuthAlgrthm; + auth_mode = psecuritypriv->dot11_auth_algrthm;if (GetPrivacy (pframe)) {u8 *iv;
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +1 -1
@@ -315,7 +315,7 @@ static u8 PS_RDY_CHECK(struct adapter *padapter) )return false; -if (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X && +if (padapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X && !padapter->securitypriv.binstallGrpkey)return false;
drivers/staging/rtl8723bs/core/rtw_recv.c +1 -1
@@ -494,7 +494,7 @@ static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre pstapriv = &adapter->stapriv; - auth_alg = adapter->securitypriv.dot11AuthAlgrthm; + auth_alg = adapter->securitypriv.dot11_auth_algrthm; ptr = precv_frame->u.hdr.rx_data; pfhdr = &precv_frame->u.hdr;
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -526,7 +526,7 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *p }else {GET_ENCRY_ALGO (psecuritypriv, psta, pattrib->encrypt, bmcast); -switch (psecuritypriv->dot11AuthAlgrthm) { +switch (psecuritypriv->dot11_auth_algrthm) {case dot11AuthAlgrthm_Open:case dot11AuthAlgrthm_Shared:case dot11AuthAlgrthm_Auto:
drivers/staging/rtl8723bs/hal/hal_com.c +1 -1
@@ -548,7 +548,7 @@ void SetHwReg(struct adapter *adapter, u8 variable, u8 *val)if (val) {/* Enable default key related setting */ reg_scr |=SCR_TXBCUSEDK ; -if (sec->dot11AuthAlgrthm != dot11AuthAlgrthm_8021X) +if (sec->dot11_auth_algrthm != dot11AuthAlgrthm_8021X) reg_scr |= (SCR_RxUseDK|SCR_TxUseDK); }else /* Disable default key related setting */ reg_scr &= ~(SCR_RXBCUSEDK |SCR_TXBCUSEDK |SCR_RxUseDK|SCR_TxUseDK);
drivers/staging/rtl8723bs/include/rtw_security.h +2 -2
@@ -91,7 +91,7 @@ struct rt_pmkid_list {struct security_priv { -u32 dot11AuthAlgrthm;/* 802.11 auth, could be open, shared, 8021x and authswitch */ +u32 dot11_auth_algrthm;/* 802.11 auth, could be open, shared, 8021x and authswitch */ u32 dot11PrivacyAlgrthm;/* This specify the privacy for shared auth. algorithm. */ /* WEP */
@@ -170,7 +170,7 @@ struct security_priv {#define GET_ENCRY_ALGO (psecuritypriv, psta, encry_algo, bmcst)\ do {\ - switch (psecuritypriv->dot11AuthAlgrthm) {\ + switch (psecuritypriv->dot11_auth_algrthm) {\ case dot11AuthAlgrthm_Open:\ case dot11AuthAlgrthm_Shared:\ case dot11AuthAlgrthm_Auto:\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +16 -16
@@ -546,7 +546,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_paif (psecuritypriv->bWepDefaultKeyIdxSet ==0 ) {/* wep default key has not been set, so use this key index as default key. */ - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Auto; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Auto; psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled; psecuritypriv->dot11PrivacyAlgrthm = _WEP40_; psecuritypriv->dot118021XGrpPrivacy = _WEP40_;
@@ -616,7 +616,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa goto exit; } -if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X && psta) {/* psk/802_1x */ +if (psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_8021X && psta) {/* psk/802_1x */ if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) {if (param->u.crypt.set_tx ==1 ) {/* pairwise key */ memcpy (psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len));
@@ -764,7 +764,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param goto exit; } -if (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) {/* 802_1x */ +if (padapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) {/* 802_1x */ struct sta_info *psta, *pbcmc_sta;struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1326,26 +1326,26 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,switch (sme_auth_type) {case NL80211_AUTHTYPE_AUTOMATIC : - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Auto; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Auto;break ;case NL80211_AUTHTYPE_OPEN_SYSTEM : - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;if (psecuritypriv->ndisauthtype > Ndis802_11AuthModeWPA) - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X;break ;case NL80211_AUTHTYPE_SHARED_KEY : - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Shared; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Shared; psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled;break ;default : - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* return -ENOTSUPP; */ }
@@ -1404,9 +1404,9 @@ static int rtw_cfg80211_set_key_mgt(struct security_priv *psecuritypriv, u32 key {if (key_mgt ==WLAN_AKM_SUITE_8021X )/* auth_type = UMAC_AUTH_TYPE_8021X; */ - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X;else if (key_mgt ==WLAN_AKM_SUITE_PSK ) { - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; }return 0 ;
@@ -1447,7 +1447,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel pwpa =rtw_get_wpa_ie (buf, &wpa_ielen, ielen);if (pwpa && wpa_ielen >0 ) {if (rtw_parse_wpa_ie (pwpa, wpa_ielen +2 , &group_cipher, &pairwise_cipher,NULL ) == _SUCCESS) { - padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + padapter->securitypriv.dot11_auth_algrthm = dot11AuthAlgrthm_8021X; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPAPSK;memcpy (padapter->securitypriv.supplicant_ie, &pwpa[0 ], wpa_ielen +2 ); }
@@ -1456,7 +1456,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel pwpa2 =rtw_get_wpa2_ie (buf, &wpa2_ielen, ielen);if (pwpa2 && wpa2_ielen >0 ) {if (rtw_parse_wpa2_ie (pwpa2, wpa2_ielen +2 , &group_cipher, &pairwise_cipher,NULL ) == _SUCCESS) { - padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + padapter->securitypriv.dot11_auth_algrthm = dot11AuthAlgrthm_8021X; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPA2PSK;memcpy (padapter->securitypriv.supplicant_ie, &pwpa2[0 ], wpa2_ielen +2 ); }
@@ -1579,7 +1579,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev, psecuritypriv->ndisencryptstatus = Ndis802_11EncryptionDisabled; psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; ret =rtw_cfg80211_set_auth_type (psecuritypriv,NL80211_AUTHTYPE_OPEN_SYSTEM );
@@ -1675,7 +1675,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, psecuritypriv->ndisencryptstatus = Ndis802_11EncryptionDisabled; psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; ret =rtw_cfg80211_set_wpa_version (psecuritypriv, sme->crypto.wpa_versions);
@@ -1698,8 +1698,8 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, }/* For WEP Shared auth */ -if ((psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Shared || - psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Auto) && sme->key) { +if ((psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_Shared || + psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_Auto) && sme->key) {u32 wep_key_idx, wep_key_len, wep_total_len;struct ndis_802_11_wep *pwep =NULL ;
drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1
@@ -534,7 +534,7 @@ static void rtw_init_default_value(struct adapter *padapter) psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt; psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt; - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psecuritypriv->dot11PrivacyKeyIndex =0 ;
Signature · 1 line
2.54.0