staging: rtl8723bs: Rename camelcase enum values dot11AuthAlgrthm_
cover staging: rtl8723bs: Rename camelcase enum values dot11AuthAlgrthm_
From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
This patch series mainly resolves the camelcase checkpatch issue for several values within an enum. It also resolves a checkpatch issue regarding the use of space instead of tab.
Dalvin-Ehinoma Noah Aiguobas (6):
staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm_8021X
staging: rtl8723bs: Replace spaces for tab
staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm_Open
staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm_Auto
staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm_Shared
staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm_WAPI
and dot11AuthAlgrthm_MaxNum
drivers/staging/rtl8723bs/core/rtw_ap.c | 8 ++--- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 18 +++++------ drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 8 ++--- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 16 +++++----- .../staging/rtl8723bs/include/rtw_security.h | 10 +++--- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 32 +++++++++---------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 11 files changed, 55 insertions(+), 55 deletions(-)
Signature · 1 line
2.54.0
PATCH 1/6 staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm_8021X
From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename value dot11AuthAlgrthm_8021X to dot11_auth_algrthm_8021x in enum to resolve checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 14 +++++++------- 10 files changed, 22 insertions(+), 22 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->dot11AuthAlgrthm == dot11_auth_algrthm_8021x) psta->ieee8021x_blocked = true;else psta->ieee8021x_blocked = false;
@@ -674,7 +674,7 @@ void start_bss_network(struct adapter *padapter)/* Set Security */ val8 = (psecuritypriv->dot11AuthAlgrthm == - dot11AuthAlgrthm_8021X) ?0xcc :0xcf ; + dot11_auth_algrthm_8021x) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));/* Beacon Control related register */
@@ -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->dot11AuthAlgrthm = dot11_auth_algrthm_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->dot11AuthAlgrthm = dot11_auth_algrthm_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->dot11AuthAlgrthm = dot11_auth_algrthm_8021x; res =rtw_set_auth (padapter, psecuritypriv);
drivers/staging/rtl8723bs/core/rtw_mlme.c +4 -4
@@ -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.dot11AuthAlgrthm == dot11_auth_algrthm_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.dot11AuthAlgrthm == dot11_auth_algrthm_8021x) {/* 802.1x */ /* Added by Albert 2009/02/18 */ /* We have to backup the PMK information for WiFi PMK Caching test item. */
@@ -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.dot11AuthAlgrthm == dot11_auth_algrthm_8021x) psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm; psta->ieee8021x_blocked = false;
@@ -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->dot11AuthAlgrthm == dot11_auth_algrthm_8021x) psetkeyparm->algorithm = (unsigned char )psecuritypriv->dot118021XGrpPrivacy;else psetkeyparm->algorithm = (u8 )psecuritypriv->dot11PrivacyAlgrthm;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -4010,7 +4010,7 @@ void start_clnt_join(struct adapter *padapter)if (caps&WLAN_CAPABILITY_ESS ) {set_msr (padapter,WIFI_FW_STATION_STATE ); - val8 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X) ?0xcc :0xcf ; + val8 = (pmlmeinfo->auth_algo == dot11_auth_algrthm_8021x) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));
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.dot11AuthAlgrthm == dot11_auth_algrthm_8021x && !padapter->securitypriv.binstallGrpkey)return false;
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -532,7 +532,7 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pcase dot11AuthAlgrthm_Auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;break ; -case dot11AuthAlgrthm_8021X: +case dot11_auth_algrthm_8021x:if (bmcast) pattrib->key_idx = (u8 )psecuritypriv->dot118021XGrpKeyid;else
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->dot11AuthAlgrthm != dot11_auth_algrthm_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_mlme.h +1 -1
@@ -46,7 +46,7 @@enum { dot11AuthAlgrthm_Open =0 , dot11AuthAlgrthm_Shared, - dot11AuthAlgrthm_8021X, + dot11_auth_algrthm_8021x, dot11AuthAlgrthm_Auto, dot11AuthAlgrthm_WAPI, dot11AuthAlgrthm_MaxNum
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -176,7 +176,7 @@ do {\case dot11AuthAlgrthm_Auto:\ encry_algo = (u8 )psecuritypriv->dot11PrivacyAlgrthm;\break ;\ -case dot11AuthAlgrthm_8021X:\ +case dot11_auth_algrthm_8021x:\if (bmcst)\ encry_algo = (u8 )psecuritypriv->dot118021XGrpPrivacy;\else \
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +7 -7
@@ -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->dot11AuthAlgrthm == dot11_auth_algrthm_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.dot11AuthAlgrthm == dot11_auth_algrthm_8021x) {/* 802_1x */ struct sta_info *psta, *pbcmc_sta;struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1334,7 +1334,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv, psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;if (psecuritypriv->ndisauthtype > Ndis802_11AuthModeWPA) - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11AuthAlgrthm = dot11_auth_algrthm_8021x;break ;case NL80211_AUTHTYPE_SHARED_KEY :
@@ -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->dot11AuthAlgrthm = dot11_auth_algrthm_8021x;else if (key_mgt ==WLAN_AKM_SUITE_PSK ) { - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11AuthAlgrthm = dot11_auth_algrthm_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.dot11AuthAlgrthm = dot11_auth_algrthm_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.dot11AuthAlgrthm = dot11_auth_algrthm_8021x; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPA2PSK;memcpy (padapter->securitypriv.supplicant_ie, &pwpa2[0 ], wpa2_ielen +2 ); }
Signature · 1 line
2.54.0
Greg KH
maintainerRe: [PATCH 1/6] staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm_8021X
Quoted 6 lines · On Mon, Jun 01, 2026 at 08:39:53PM +0000, [email protected] wrote:
From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename value
dot11AuthAlgrthm_8021Xtodot11_auth_algrthm_8021xin enum to resolve checkpatch.pl CamelCase finding.Signed-off-by Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Quoted 12 lines
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 14 +++++++------- 10 files changed, 22 insertions(+), 22 deletions(-)
Does not apply to the current staging-testing branch :(
PATCH 2/6 staging: rtl8723bs: Replace spaces for tab
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Resolving checkpatch warning by removing spaces and using tab instead.
--- drivers/staging/rtl8723bs/include/rtw_mlme.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/include/rtw_mlme.h +8 -8
@@ -13,8 +13,8 @@/* define MAX_JOIN_TIMEOUT 2500 */ #define MAX_JOIN_TIMEOUT 6500 -/* Commented by Albert 20101105 */ -/* Increase the scanning timeout because of increasing the SURVEY_TO value. */ +/* Commented by Albert 20101105 */ +/* Increase the scanning timeout because of increasing the SURVEY_TO value. */ #define SCANNING_TIMEOUT 8000
@@ -44,12 +44,12 @@enum { - dot11AuthAlgrthm_Open =0 , - dot11AuthAlgrthm_Shared, - dot11_auth_algrthm_8021x, - dot11AuthAlgrthm_Auto, - dot11AuthAlgrthm_WAPI, - dot11AuthAlgrthm_MaxNum + dot11AuthAlgrthm_Open =0 , + dot11AuthAlgrthm_Shared, + dot11_auth_algrthm_8021x, + dot11AuthAlgrthm_Auto, + dot11AuthAlgrthm_WAPI, + dot11AuthAlgrthm_MaxNum };/* Scan type including active and passive scan. */
Signature · 1 line
2.54.0
PATCH 3/6 staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm_Open
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename variable dot11AuthAlgrthm_Open to dot11_auth_algrthm_open in enum to resolve checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 ++++---- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
@@ -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->dot11AuthAlgrthm = dot11_auth_algrthm_open;/* open system */ psec_priv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psec_priv->dot11PrivacyKeyIndex =0 ;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -2
@@ -237,7 +237,7 @@ static void init_mlme_ext_priv_value(struct adapter *padapter) pmlmeinfo->reassoc_count =0 ; pmlmeinfo->link_count =0 ; pmlmeinfo->auth_seq =0 ; - pmlmeinfo->auth_algo = dot11AuthAlgrthm_Open; + pmlmeinfo->auth_algo = dot11_auth_algrthm_open; pmlmeinfo->key_index =0 ; pmlmeinfo->iv =0 ;
@@ -857,7 +857,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_framif (status !=0 ) {if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11AuthAlgrthm_Auto) */ if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) - pmlmeinfo->auth_algo = dot11AuthAlgrthm_Open; + pmlmeinfo->auth_algo = dot11_auth_algrthm_open;else pmlmeinfo->auth_algo = dot11AuthAlgrthm_Shared;/* pmlmeinfo->reauth_count = 0; */
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -527,7 +527,7 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pGET_ENCRY_ALGO (psecuritypriv, psta, pattrib->encrypt, bmcast);switch (psecuritypriv->dot11AuthAlgrthm) { -case dot11AuthAlgrthm_Open: +case dot11_auth_algrthm_open:case dot11AuthAlgrthm_Shared:case dot11AuthAlgrthm_Auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -44,7 +44,7 @@enum { - dot11AuthAlgrthm_Open =0 , + dot11_auth_algrthm_open =0 , dot11AuthAlgrthm_Shared, dot11_auth_algrthm_8021x, dot11AuthAlgrthm_Auto,
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -171,7 +171,7 @@ struct security_priv {#define GET_ENCRY_ALGO (psecuritypriv, psta, encry_algo, bmcst)\ do {\ switch (psecuritypriv->dot11AuthAlgrthm) {\ - case dot11AuthAlgrthm_Open:\ + case dot11_auth_algrthm_open:\ case dot11AuthAlgrthm_Shared:\ case dot11AuthAlgrthm_Auto:\ encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +4 -4
@@ -1331,7 +1331,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,break ;case NL80211_AUTHTYPE_OPEN_SYSTEM : - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; + psecuritypriv->dot11AuthAlgrthm = dot11_auth_algrthm_open;if (psecuritypriv->ndisauthtype > Ndis802_11AuthModeWPA) psecuritypriv->dot11AuthAlgrthm = dot11_auth_algrthm_8021x;
@@ -1345,7 +1345,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,break ;default : - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; + psecuritypriv->dot11AuthAlgrthm = dot11_auth_algrthm_open;/* return -ENOTSUPP; */ }
@@ -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->dot11AuthAlgrthm = dot11_auth_algrthm_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->dot11AuthAlgrthm = dot11_auth_algrthm_open;/* open system */ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; ret =rtw_cfg80211_set_wpa_version (psecuritypriv, sme->crypto.wpa_versions);
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->dot11AuthAlgrthm = dot11_auth_algrthm_open;/* open system */ psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psecuritypriv->dot11PrivacyKeyIndex =0 ;
Signature · 1 line
2.54.0
PATCH 4/6 staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm_Auto
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename variable dot11AuthAlgrthm_Auto to dot11_auth_algrthm_auto to resolve checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -855,7 +855,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram status =le16_to_cpu (*(__le16 *)((SIZE_PTR )pframe +WLAN_HDR_A3_LEN + offset +4 ));if (status !=0 ) { -if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11AuthAlgrthm_Auto) */ +if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11_auth_algrthm_auto) */ if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) pmlmeinfo->auth_algo = dot11_auth_algrthm_open;else
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -529,7 +529,7 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pswitch (psecuritypriv->dot11AuthAlgrthm) {case dot11_auth_algrthm_open:case dot11AuthAlgrthm_Shared: -case dot11AuthAlgrthm_Auto: +case dot11_auth_algrthm_auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;break ;case dot11_auth_algrthm_8021x:
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -47,7 +47,7 @@ enum { dot11_auth_algrthm_open =0 , dot11AuthAlgrthm_Shared, dot11_auth_algrthm_8021x, - dot11AuthAlgrthm_Auto, + dot11_auth_algrthm_auto, dot11AuthAlgrthm_WAPI, dot11AuthAlgrthm_MaxNum };
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -173,7 +173,7 @@ do {\switch (psecuritypriv->dot11AuthAlgrthm) {\case dot11_auth_algrthm_open:\case dot11AuthAlgrthm_Shared:\ -case dot11AuthAlgrthm_Auto:\ +case dot11_auth_algrthm_auto:\ encry_algo = (u8 )psecuritypriv->dot11PrivacyAlgrthm;\break ;\case dot11_auth_algrthm_8021x:\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +3 -3
@@ -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->dot11AuthAlgrthm = dot11_auth_algrthm_auto; psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled; psecuritypriv->dot11PrivacyAlgrthm = _WEP40_; psecuritypriv->dot118021XGrpPrivacy = _WEP40_;
@@ -1326,7 +1326,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,switch (sme_auth_type) {case NL80211_AUTHTYPE_AUTOMATIC : - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Auto; + psecuritypriv->dot11AuthAlgrthm = dot11_auth_algrthm_auto;break ;case NL80211_AUTHTYPE_OPEN_SYSTEM :
@@ -1699,7 +1699,7 @@ 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) { + psecuritypriv->dot11AuthAlgrthm == dot11_auth_algrthm_auto) && sme->key) {u32 wep_key_idx, wep_key_len, wep_total_len;struct ndis_802_11_wep *pwep =NULL ;
Signature · 1 line
2.54.0
PATCH 5/6 staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm_Shared
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename variable dot11AuthAlgrthm_Shared to dot11_auth_algrthm_shared to resolve checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 10 +++++----- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +5 -5
@@ -856,10 +856,10 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_framif (status !=0 ) {if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11_auth_algrthm_auto) */ -if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) +if (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) pmlmeinfo->auth_algo = dot11_auth_algrthm_open;else - pmlmeinfo->auth_algo = dot11AuthAlgrthm_Shared; + pmlmeinfo->auth_algo = dot11_auth_algrthm_shared;/* pmlmeinfo->reauth_count = 0; */ }
@@ -868,7 +868,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram }if (seq ==2 ) { -if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) { +if (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) {/* legendary shared system */ p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_,WLAN_EID_CHALLENGE , (int *)&len, pkt_len -WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);
@@ -886,7 +886,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram/* open system */ go2asoc =1 ; }else if (seq ==4 ) { -if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) +if (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) go2asoc =1 ;else goto authclnt_fail;
@@ -2574,7 +2574,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned shortmemcpy (pwlanhdr->addr3,get_my_bssid (&pmlmeinfo->network),ETH_ALEN );/* setting auth algo number */ - val16 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) ?1 :0 ;/* 0:OPEN System, 1:Shared key */ + val16 = (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) ?1 :0 ;/* 0:OPEN System, 1:Shared key */ if (val16) use_shared_key =1 ; le_tmp =cpu_to_le16 (val16);
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -528,7 +528,7 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pswitch (psecuritypriv->dot11AuthAlgrthm) {case dot11_auth_algrthm_open: -case dot11AuthAlgrthm_Shared: +case dot11_auth_algrthm_shared:case dot11_auth_algrthm_auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;break ;
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -45,7 +45,7 @@enum { dot11_auth_algrthm_open =0 , - dot11AuthAlgrthm_Shared, + dot11_auth_algrthm_shared, dot11_auth_algrthm_8021x, dot11_auth_algrthm_auto, dot11AuthAlgrthm_WAPI,
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -172,7 +172,7 @@ struct security_priv { do {\ switch (psecuritypriv->dot11AuthAlgrthm) {\ case dot11_auth_algrthm_open:\ - case dot11AuthAlgrthm_Shared:\ + case dot11_auth_algrthm_shared:\ case dot11_auth_algrthm_auto:\ encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\ break;\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -2
@@ -1339,7 +1339,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,break ;case NL80211_AUTHTYPE_SHARED_KEY : - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Shared; + psecuritypriv->dot11AuthAlgrthm = dot11_auth_algrthm_shared; psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled;
@@ -1698,7 +1698,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, }/* For WEP Shared auth */ -if ((psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Shared || +if ((psecuritypriv->dot11AuthAlgrthm == dot11_auth_algrthm_shared || psecuritypriv->dot11AuthAlgrthm == dot11_auth_algrthm_auto) && sme->key) {u32 wep_key_idx, wep_key_len, wep_total_len;struct ndis_802_11_wep *pwep =NULL ;
Signature · 1 line
2.54.0
Greg KH
maintainerRe: [PATCH 5/6] staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm_Shared
Quoted 4 lines · On Mon, Jun 01, 2026 at 08:39:57PM +0000, [email protected] wrote:
From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename variable
dot11AuthAlgrthm_Sharedtodot11_auth_algrthm_sharedto resolve checkpatch.pl CamelCase finding.
It is not a variable, it is a enum :(
PATCH 6/6 staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm_WAPI and dot11AuthAlgrthm_MaxNum
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename variable dot11AuthAlgrthm_WAPI and dot11AuthAlgrthm_MaxNum to resolve checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/include/rtw_mlme.h | 4 ++-- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/include/rtw_mlme.h +2 -2
@@ -48,8 +48,8 @@ enum { dot11_auth_algrthm_shared, dot11_auth_algrthm_8021x, dot11_auth_algrthm_auto, - dot11AuthAlgrthm_WAPI, - dot11AuthAlgrthm_MaxNum + dot11_auth_algrthm_wapi, + dot11_auth_algrthm_maxnum };/* Scan type including active and passive scan. */
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -182,7 +182,7 @@ do {\ else\ encry_algo = (u8 )psta->dot118021XPrivacy;\break ;\ -case dot11AuthAlgrthm_WAPI:\ +case dot11_auth_algrthm_wapi:\ encry_algo = (u8 )psecuritypriv->dot11PrivacyAlgrthm;\break ;\ } \
Signature · 1 line
2.54.0
v2 cover Rename camelcase enum values dot11AuthAlgrthm_
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
This patch series renames camelcase enum values in the rtl8723bs driver to address checkpatch.pl CamelCase warnings. It also replaces spaces with tabs where required by the kernel coding style.
Changes in v2:
- Correct commit descriptions to refer to enum values instead of variables as pointed out by the reviewer.
- Rebased onto latest staging-testing.
Dalvin-Ehinoma Noah Aiguobas (6):
staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_8021X
staging: rtl8723bs: Replace spaces for tab
staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Open
staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Auto
staging: rtl8723bs: Rename camelcase enum value
dot11AuthAlgrthm_Shared
staging: rtl8723bs: Rename camelcase enum values dot11AuthAlgrthm_WAPI
and dot11AuthAlgrthm_MaxNum
drivers/staging/rtl8723bs/core/rtw_ap.c | 8 ++--- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 18 +++++------ drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 8 ++--- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 16 +++++----- .../staging/rtl8723bs/include/rtw_security.h | 10 +++--- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 32 +++++++++---------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 11 files changed, 55 insertions(+), 55 deletions(-)
Signature · 1 line
2.54.0
PATCH v2 1/6 staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_8021X
From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum value dot11AuthAlgrthm_8021X to dot11_auth_algrthm_8021x to fix the checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 14 +++++++------- 10 files changed, 22 insertions(+), 22 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->dot11_auth_algrthm == dot11AuthAlgrthm_8021X) +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021x) psta->ieee8021x_blocked = true;else psta->ieee8021x_blocked = false;
@@ -674,7 +674,7 @@ void start_bss_network(struct adapter *padapter)/* Set Security */ val8 = (psecuritypriv->dot11_auth_algrthm == - dot11AuthAlgrthm_8021X) ?0xcc :0xcf ; + dot11_auth_algrthm_8021x) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));/* Beacon Control related register */
@@ -872,7 +872,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) { - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_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->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; psecuritypriv->dot8021xalg =1 ;/* psk, todo:802.1x */
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -1
@@ -398,7 +398,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11 psecuritypriv->ndisauthtype = authmode;if (psecuritypriv->ndisauthtype >3 ) - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; res =rtw_set_auth (padapter, psecuritypriv);
drivers/staging/rtl8723bs/core/rtw_mlme.c +4 -4
@@ -972,7 +972,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.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) { +if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) { padapter->securitypriv.binstallGrpkey = false; padapter->securitypriv.busetkipkey = false; padapter->securitypriv.bgrpkey_handshake = false;
@@ -1085,7 +1085,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)spin_lock_bh (&adapter->security_key_mutex); -if (adapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) { +if (adapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) {/* 802.1x */ /* Added by Albert 2009/02/18 */ /* We have to backup the PMK information for WiFi PMK Caching test item. */
@@ -1334,7 +1334,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)rtw_sta_media_status_rpt (adapter, psta,1 ); -if (adapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) +if (adapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm; psta->ieee8021x_blocked = false;
@@ -1887,7 +1887,7 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp goto exit; } -if (psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_8021X) +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021x) psetkeyparm->algorithm = (unsigned char )psecuritypriv->dot118021XGrpPrivacy;else psetkeyparm->algorithm = (u8 )psecuritypriv->dot11PrivacyAlgrthm;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -4012,7 +4012,7 @@ void start_clnt_join(struct adapter *padapter)if (caps&WLAN_CAPABILITY_ESS ) {set_msr (padapter,WIFI_FW_STATION_STATE ); - val8 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X) ?0xcc :0xcf ; + val8 = (pmlmeinfo->auth_algo == dot11_auth_algrthm_8021x) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));
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.dot11_auth_algrthm == dot11AuthAlgrthm_8021X && +if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x && !padapter->securitypriv.binstallGrpkey)return false;
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -529,7 +529,7 @@ static int update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pcase dot11AuthAlgrthm_Auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;break ; -case dot11AuthAlgrthm_8021X: +case dot11_auth_algrthm_8021x:if (bmcast) pattrib->key_idx = (u8 )psecuritypriv->dot118021XGrpKeyid;else
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->dot11_auth_algrthm != dot11AuthAlgrthm_8021X) +if (sec->dot11_auth_algrthm != dot11_auth_algrthm_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_mlme.h +1 -1
@@ -46,7 +46,7 @@enum { dot11AuthAlgrthm_Open =0 , dot11AuthAlgrthm_Shared, - dot11AuthAlgrthm_8021X, + dot11_auth_algrthm_8021x, dot11AuthAlgrthm_Auto, dot11AuthAlgrthm_WAPI, dot11AuthAlgrthm_MaxNum
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -176,7 +176,7 @@ do {\case dot11AuthAlgrthm_Auto:\ encry_algo = (u8 )psecuritypriv->dot11PrivacyAlgrthm;\break ;\ -case dot11AuthAlgrthm_8021X:\ +case dot11_auth_algrthm_8021x:\if (bmcst)\ encry_algo = (u8 )psecuritypriv->dot118021XGrpPrivacy;\else \
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +7 -7
@@ -609,7 +609,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa goto exit; } -if (psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_8021X && psta) {/* psk/802_1x */ +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_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));
@@ -757,7 +757,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param goto exit; } -if (padapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) {/* 802_1x */ +if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) {/* 802_1x */ struct sta_info *psta, *pbcmc_sta;struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1318,7 +1318,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv, psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;if (psecuritypriv->ndisauthtype > Ndis802_11AuthModeWPA) - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x;break ;case NL80211_AUTHTYPE_SHARED_KEY :
@@ -1388,9 +1388,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->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x;else if (key_mgt ==WLAN_AKM_SUITE_PSK ) { - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; }return 0 ;
@@ -1431,7 +1431,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.dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + padapter->securitypriv.dot11_auth_algrthm = dot11_auth_algrthm_8021x; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPAPSK;memcpy (padapter->securitypriv.supplicant_ie, &pwpa[0 ], wpa_ielen +2 ); }
@@ -1440,7 +1440,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.dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + padapter->securitypriv.dot11_auth_algrthm = dot11_auth_algrthm_8021x; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPA2PSK;memcpy (padapter->securitypriv.supplicant_ie, &pwpa2[0 ], wpa2_ielen +2 ); }
Signature · 1 line
2.54.0
PATCH v2 2/6 staging: rtl8723bs: Replace spaces for tab
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Resolving checkpatch warning by removing spaces and using tab instead.
--- drivers/staging/rtl8723bs/include/rtw_mlme.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/include/rtw_mlme.h +2 -2
@@ -13,8 +13,8 @@/* define MAX_JOIN_TIMEOUT 2500 */ #define MAX_JOIN_TIMEOUT 6500 -/* Commented by Albert 20101105 */ -/* Increase the scanning timeout because of increasing the SURVEY_TO value. */ +/* Commented by Albert 20101105 */ +/* Increase the scanning timeout because of increasing the SURVEY_TO value. */ #define SCANNING_TIMEOUT 8000
Signature · 1 line
2.54.0
Greg KH
maintainerRe: [PATCH v2 2/6] staging: rtl8723bs: Replace spaces for tab
Quoted 14 lines · On Wed, Jul 08, 2026 at 12:15:59PM +0000, [email protected] wrote:
From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Resolving checkpatch warning by removing spaces and using tab instead.
Signed-off-by Dalvin-Ehinoma Noah Aiguobas <[email protected]>--- drivers/staging/rtl8723bs/include/rtw_mlme.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/staging/rtl8723bs/include/rtw_mlme.h +0
-0
drivers/staging/rtl8723bs/include/rtw_mlme.h line 17
Quoted 7 lines
drivers/staging/rtl8723bs/include/rtw_mlme.h +2
-2@@ -13,8 +13,8 @@/* define MAX_JOIN_TIMEOUT 2500 */ #define MAX_JOIN_TIMEOUT 6500 -/* Commented by Albert 20101105 */ -/* Increase the scanning timeout because of increasing the SURVEY_TO value. */ +/* Commented by Albert 20101105 */ +/* Increase the scanning timeout because of increasing the SURVEY_TO value. */
That's very odd, why is checkpatch complainig about this? The original is just fine, no tabs are needed here.
thanks,
greg k-h
PATCH v2 3/6 staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Open
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum value dot11AuthAlgrthm_Open to dot11_auth_algrthm_open in enum to fix checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 ++++---- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
@@ -1119,7 +1119,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)/* */ struct security_priv *psec_priv = &adapter->securitypriv; - psec_priv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ + psec_priv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* open system */ psec_priv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psec_priv->dot11PrivacyKeyIndex =0 ;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -2
@@ -237,7 +237,7 @@ static void init_mlme_ext_priv_value(struct adapter *padapter) pmlmeinfo->reassoc_count =0 ; pmlmeinfo->link_count =0 ; pmlmeinfo->auth_seq =0 ; - pmlmeinfo->auth_algo = dot11AuthAlgrthm_Open; + pmlmeinfo->auth_algo = dot11_auth_algrthm_open; pmlmeinfo->key_index =0 ; pmlmeinfo->iv =0 ;
@@ -860,7 +860,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_framif (status !=0 ) {if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11AuthAlgrthm_Auto) */ if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) - pmlmeinfo->auth_algo = dot11AuthAlgrthm_Open; + pmlmeinfo->auth_algo = dot11_auth_algrthm_open;else pmlmeinfo->auth_algo = dot11AuthAlgrthm_Shared;/* pmlmeinfo->reauth_count = 0; */
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -524,7 +524,7 @@ static int update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pGET_ENCRY_ALGO (psecuritypriv, psta, pattrib->encrypt, bmcast);switch (psecuritypriv->dot11_auth_algrthm) { -case dot11AuthAlgrthm_Open: +case dot11_auth_algrthm_open:case dot11AuthAlgrthm_Shared:case dot11AuthAlgrthm_Auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -44,7 +44,7 @@enum { - dot11AuthAlgrthm_Open =0 , + dot11_auth_algrthm_open =0 , dot11AuthAlgrthm_Shared, dot11_auth_algrthm_8021x, dot11AuthAlgrthm_Auto,
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -171,7 +171,7 @@ struct security_priv {#define GET_ENCRY_ALGO (psecuritypriv, psta, encry_algo, bmcst)\ do {\ switch (psecuritypriv->dot11_auth_algrthm) {\ - case dot11AuthAlgrthm_Open:\ + case dot11_auth_algrthm_open:\ case dot11AuthAlgrthm_Shared:\ case dot11AuthAlgrthm_Auto:\ encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +4 -4
@@ -1315,7 +1315,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,break ;case NL80211_AUTHTYPE_OPEN_SYSTEM : - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;if (psecuritypriv->ndisauthtype > Ndis802_11AuthModeWPA) psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x;
@@ -1329,7 +1329,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,break ;default : - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* return -ENOTSUPP; */ }
@@ -1563,7 +1563,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->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* open system */ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; ret =rtw_cfg80211_set_auth_type (psecuritypriv,NL80211_AUTHTYPE_OPEN_SYSTEM );
@@ -1659,7 +1659,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->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* open system */ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; ret =rtw_cfg80211_set_wpa_version (psecuritypriv, sme->crypto.wpa_versions);
drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1
@@ -531,7 +531,7 @@ static void rtw_init_default_value(struct adapter *padapter) psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt; psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt; - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* open system */ psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psecuritypriv->dot11PrivacyKeyIndex =0 ;
Signature · 1 line
2.54.0
PATCH v2 4/6 staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Auto
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum value dot11AuthAlgrthm_Auto to dot11_auth_algrthm_auto to fix checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -858,7 +858,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram status =le16_to_cpu (*(__le16 *)((SIZE_PTR )pframe +WLAN_HDR_A3_LEN + offset +4 ));if (status !=0 ) { -if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11AuthAlgrthm_Auto) */ +if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11_auth_algrthm_auto) */ if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) pmlmeinfo->auth_algo = dot11_auth_algrthm_open;else
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -526,7 +526,7 @@ static int update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pswitch (psecuritypriv->dot11_auth_algrthm) {case dot11_auth_algrthm_open:case dot11AuthAlgrthm_Shared: -case dot11AuthAlgrthm_Auto: +case dot11_auth_algrthm_auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;break ;case dot11_auth_algrthm_8021x:
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -47,7 +47,7 @@ enum { dot11_auth_algrthm_open =0 , dot11AuthAlgrthm_Shared, dot11_auth_algrthm_8021x, - dot11AuthAlgrthm_Auto, + dot11_auth_algrthm_auto, dot11AuthAlgrthm_WAPI, dot11AuthAlgrthm_MaxNum };
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -173,7 +173,7 @@ do {\switch (psecuritypriv->dot11_auth_algrthm) {\case dot11_auth_algrthm_open:\case dot11AuthAlgrthm_Shared:\ -case dot11AuthAlgrthm_Auto:\ +case dot11_auth_algrthm_auto:\ encry_algo = (u8 )psecuritypriv->dot11PrivacyAlgrthm;\break ;\case dot11_auth_algrthm_8021x:\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +3 -3
@@ -539,7 +539,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->dot11_auth_algrthm = dot11AuthAlgrthm_Auto; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_auto; psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled; psecuritypriv->dot11PrivacyAlgrthm = _WEP40_; psecuritypriv->dot118021XGrpPrivacy = _WEP40_;
@@ -1310,7 +1310,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,switch (sme_auth_type) {case NL80211_AUTHTYPE_AUTOMATIC : - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Auto; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_auto;break ;case NL80211_AUTHTYPE_OPEN_SYSTEM :
@@ -1683,7 +1683,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,/* For WEP Shared auth */ if ((psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_Shared || - psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_Auto) && sme->key) { + psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_auto) && sme->key) {u32 wep_key_idx, wep_key_len, wep_total_len;struct ndis_802_11_wep *pwep =NULL ;
Signature · 1 line
2.54.0
PATCH v2 5/6 staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Shared
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum value dot11AuthAlgrthm_Shared to dot11_auth_algrthm_shared to fix checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 10 +++++----- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +5 -5
@@ -859,10 +859,10 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_framif (status !=0 ) {if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11_auth_algrthm_auto) */ -if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) +if (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) pmlmeinfo->auth_algo = dot11_auth_algrthm_open;else - pmlmeinfo->auth_algo = dot11AuthAlgrthm_Shared; + pmlmeinfo->auth_algo = dot11_auth_algrthm_shared;/* pmlmeinfo->reauth_count = 0; */ }
@@ -871,7 +871,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram }if (seq ==2 ) { -if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) { +if (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) {/* legendary shared system */ p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_,WLAN_EID_CHALLENGE , (int *)&len, pkt_len -WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);
@@ -889,7 +889,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram/* open system */ go2asoc =1 ; }else if (seq ==4 ) { -if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) +if (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) go2asoc =1 ;else goto authclnt_fail;
@@ -2577,7 +2577,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned shortmemcpy (pwlanhdr->addr3,get_my_bssid (&pmlmeinfo->network),ETH_ALEN );/* setting auth algo number */ - val16 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) ?1 :0 ;/* 0:OPEN System, 1:Shared key */ + val16 = (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) ?1 :0 ;/* 0:OPEN System, 1:Shared key */ if (val16) use_shared_key =1 ; le_tmp =cpu_to_le16 (val16);
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -525,7 +525,7 @@ static int update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pswitch (psecuritypriv->dot11_auth_algrthm) {case dot11_auth_algrthm_open: -case dot11AuthAlgrthm_Shared: +case dot11_auth_algrthm_shared:case dot11_auth_algrthm_auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;break ;
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -45,7 +45,7 @@enum { dot11_auth_algrthm_open =0 , - dot11AuthAlgrthm_Shared, + dot11_auth_algrthm_shared, dot11_auth_algrthm_8021x, dot11_auth_algrthm_auto, dot11AuthAlgrthm_WAPI,
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -172,7 +172,7 @@ struct security_priv { do {\ switch (psecuritypriv->dot11_auth_algrthm) {\ case dot11_auth_algrthm_open:\ - case dot11AuthAlgrthm_Shared:\ + case dot11_auth_algrthm_shared:\ case dot11_auth_algrthm_auto:\ encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\ break;\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -2
@@ -1323,7 +1323,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,break ;case NL80211_AUTHTYPE_SHARED_KEY : - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Shared; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_shared; psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled;
@@ -1682,7 +1682,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, }/* For WEP Shared auth */ -if ((psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_Shared || +if ((psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_shared || psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_auto) && sme->key) {u32 wep_key_idx, wep_key_len, wep_total_len;struct ndis_802_11_wep *pwep =NULL ;
Signature · 1 line
2.54.0
PATCH v2 6/6 staging: rtl8723bs: Rename camelcase enum values dot11AuthAlgrthm_WAPI and dot11AuthAlgrthm_MaxNum
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum values dot11AuthAlgrthm_WAPI and dot11AuthAlgrthm_MaxNum to fix checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/include/rtw_mlme.h | 4 ++-- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/include/rtw_mlme.h +2 -2
@@ -48,8 +48,8 @@ enum { dot11_auth_algrthm_shared, dot11_auth_algrthm_8021x, dot11_auth_algrthm_auto, - dot11AuthAlgrthm_WAPI, - dot11AuthAlgrthm_MaxNum + dot11_auth_algrthm_wapi, + dot11_auth_algrthm_maxnum };/* Scan type including active and passive scan. */
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -182,7 +182,7 @@ do {\ else\ encry_algo = (u8 )psta->dot118021XPrivacy;\break ;\ -case dot11AuthAlgrthm_WAPI:\ +case dot11_auth_algrthm_wapi:\ encry_algo = (u8 )psecuritypriv->dot11PrivacyAlgrthm;\break ;\ } \
Signature · 1 line
2.54.0
v3 cover Rename camelcase enum values dot11AuthAlgrthm_
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
This patch series renames camelcase enum values in the rtl8723bs driver to address checkpatch.pl CamelCase warnings. It also replaces spaces with tabs where required by the kernel coding style.
Changes in v3:
- Dropped v2 2/6 as changes are already in staging tree after rebase or unnecessary
Dalvin-Ehinoma Noah Aiguobas (5):
staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_8021X
staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Open
staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Auto
staging: rtl8723bs: Rename camelcase enum value
dot11AuthAlgrthm_Shared
staging: rtl8723bs: Rename camelcase enum values dot11AuthAlgrthm_WAPI
and dot11AuthAlgrthm_MaxNum
drivers/staging/rtl8723bs/core/rtw_ap.c | 8 ++--- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 18 +++++------ drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 8 ++--- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 12 +++---- .../staging/rtl8723bs/include/rtw_security.h | 10 +++--- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 32 +++++++++---------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 11 files changed, 53 insertions(+), 53 deletions(-)
Signature · 1 line
2.54.0
PATCH v3 1/5 staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_8021X
From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum value dot11AuthAlgrthm_8021X to dot11_auth_algrthm_8021x to fix the checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 14 +++++++------- 10 files changed, 22 insertions(+), 22 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->dot11_auth_algrthm == dot11AuthAlgrthm_8021X) +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021x) psta->ieee8021x_blocked = true;else psta->ieee8021x_blocked = false;
@@ -674,7 +674,7 @@ void start_bss_network(struct adapter *padapter)/* Set Security */ val8 = (psecuritypriv->dot11_auth_algrthm == - dot11AuthAlgrthm_8021X) ?0xcc :0xcf ; + dot11_auth_algrthm_8021x) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));/* Beacon Control related register */
@@ -872,7 +872,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) { - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_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->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; psecuritypriv->dot8021xalg =1 ;/* psk, todo:802.1x */
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -1
@@ -398,7 +398,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11 psecuritypriv->ndisauthtype = authmode;if (psecuritypriv->ndisauthtype >3 ) - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; res =rtw_set_auth (padapter, psecuritypriv);
drivers/staging/rtl8723bs/core/rtw_mlme.c +4 -4
@@ -972,7 +972,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.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) { +if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) { padapter->securitypriv.binstallGrpkey = false; padapter->securitypriv.busetkipkey = false; padapter->securitypriv.bgrpkey_handshake = false;
@@ -1085,7 +1085,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)spin_lock_bh (&adapter->security_key_mutex); -if (adapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) { +if (adapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) {/* 802.1x */ /* Added by Albert 2009/02/18 */ /* We have to backup the PMK information for WiFi PMK Caching test item. */
@@ -1334,7 +1334,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)rtw_sta_media_status_rpt (adapter, psta,1 ); -if (adapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) +if (adapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm; psta->ieee8021x_blocked = false;
@@ -1887,7 +1887,7 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp goto exit; } -if (psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_8021X) +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021x) psetkeyparm->algorithm = (unsigned char )psecuritypriv->dot118021XGrpPrivacy;else psetkeyparm->algorithm = (u8 )psecuritypriv->dot11PrivacyAlgrthm;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -4012,7 +4012,7 @@ void start_clnt_join(struct adapter *padapter)if (caps&WLAN_CAPABILITY_ESS ) {set_msr (padapter,WIFI_FW_STATION_STATE ); - val8 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X) ?0xcc :0xcf ; + val8 = (pmlmeinfo->auth_algo == dot11_auth_algrthm_8021x) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));
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.dot11_auth_algrthm == dot11AuthAlgrthm_8021X && +if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x && !padapter->securitypriv.binstallGrpkey)return false;
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -529,7 +529,7 @@ static int update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pcase dot11AuthAlgrthm_Auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;break ; -case dot11AuthAlgrthm_8021X: +case dot11_auth_algrthm_8021x:if (bmcast) pattrib->key_idx = (u8 )psecuritypriv->dot118021XGrpKeyid;else
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->dot11_auth_algrthm != dot11AuthAlgrthm_8021X) +if (sec->dot11_auth_algrthm != dot11_auth_algrthm_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_mlme.h +1 -1
@@ -46,7 +46,7 @@enum { dot11AuthAlgrthm_Open =0 , dot11AuthAlgrthm_Shared, - dot11AuthAlgrthm_8021X, + dot11_auth_algrthm_8021x, dot11AuthAlgrthm_Auto, dot11AuthAlgrthm_WAPI, dot11AuthAlgrthm_MaxNum
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -176,7 +176,7 @@ do {\case dot11AuthAlgrthm_Auto:\ encry_algo = (u8 )psecuritypriv->dot11PrivacyAlgrthm;\break ;\ -case dot11AuthAlgrthm_8021X:\ +case dot11_auth_algrthm_8021x:\if (bmcst)\ encry_algo = (u8 )psecuritypriv->dot118021XGrpPrivacy;\else \
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +7 -7
@@ -609,7 +609,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa goto exit; } -if (psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_8021X && psta) {/* psk/802_1x */ +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_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));
@@ -757,7 +757,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param goto exit; } -if (padapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) {/* 802_1x */ +if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) {/* 802_1x */ struct sta_info *psta, *pbcmc_sta;struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1318,7 +1318,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv, psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;if (psecuritypriv->ndisauthtype > Ndis802_11AuthModeWPA) - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x;break ;case NL80211_AUTHTYPE_SHARED_KEY :
@@ -1388,9 +1388,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->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x;else if (key_mgt ==WLAN_AKM_SUITE_PSK ) { - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; }return 0 ;
@@ -1431,7 +1431,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.dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + padapter->securitypriv.dot11_auth_algrthm = dot11_auth_algrthm_8021x; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPAPSK;memcpy (padapter->securitypriv.supplicant_ie, &pwpa[0 ], wpa_ielen +2 ); }
@@ -1440,7 +1440,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.dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + padapter->securitypriv.dot11_auth_algrthm = dot11_auth_algrthm_8021x; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPA2PSK;memcpy (padapter->securitypriv.supplicant_ie, &pwpa2[0 ], wpa2_ielen +2 ); }
Signature · 1 line
2.54.0
PATCH v3 2/5 staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Open
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum value dot11AuthAlgrthm_Open to dot11_auth_algrthm_open in enum to fix checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 ++++---- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
@@ -1119,7 +1119,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)/* */ struct security_priv *psec_priv = &adapter->securitypriv; - psec_priv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ + psec_priv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* open system */ psec_priv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psec_priv->dot11PrivacyKeyIndex =0 ;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -2
@@ -237,7 +237,7 @@ static void init_mlme_ext_priv_value(struct adapter *padapter) pmlmeinfo->reassoc_count =0 ; pmlmeinfo->link_count =0 ; pmlmeinfo->auth_seq =0 ; - pmlmeinfo->auth_algo = dot11AuthAlgrthm_Open; + pmlmeinfo->auth_algo = dot11_auth_algrthm_open; pmlmeinfo->key_index =0 ; pmlmeinfo->iv =0 ;
@@ -860,7 +860,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_framif (status !=0 ) {if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11AuthAlgrthm_Auto) */ if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) - pmlmeinfo->auth_algo = dot11AuthAlgrthm_Open; + pmlmeinfo->auth_algo = dot11_auth_algrthm_open;else pmlmeinfo->auth_algo = dot11AuthAlgrthm_Shared;/* pmlmeinfo->reauth_count = 0; */
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -524,7 +524,7 @@ static int update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pGET_ENCRY_ALGO (psecuritypriv, psta, pattrib->encrypt, bmcast);switch (psecuritypriv->dot11_auth_algrthm) { -case dot11AuthAlgrthm_Open: +case dot11_auth_algrthm_open:case dot11AuthAlgrthm_Shared:case dot11AuthAlgrthm_Auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -44,7 +44,7 @@enum { - dot11AuthAlgrthm_Open =0 , + dot11_auth_algrthm_open =0 , dot11AuthAlgrthm_Shared, dot11_auth_algrthm_8021x, dot11AuthAlgrthm_Auto,
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -171,7 +171,7 @@ struct security_priv {#define GET_ENCRY_ALGO (psecuritypriv, psta, encry_algo, bmcst)\ do {\ switch (psecuritypriv->dot11_auth_algrthm) {\ - case dot11AuthAlgrthm_Open:\ + case dot11_auth_algrthm_open:\ case dot11AuthAlgrthm_Shared:\ case dot11AuthAlgrthm_Auto:\ encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +4 -4
@@ -1315,7 +1315,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,break ;case NL80211_AUTHTYPE_OPEN_SYSTEM : - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;if (psecuritypriv->ndisauthtype > Ndis802_11AuthModeWPA) psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x;
@@ -1329,7 +1329,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,break ;default : - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* return -ENOTSUPP; */ }
@@ -1563,7 +1563,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->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* open system */ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; ret =rtw_cfg80211_set_auth_type (psecuritypriv,NL80211_AUTHTYPE_OPEN_SYSTEM );
@@ -1659,7 +1659,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->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* open system */ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; ret =rtw_cfg80211_set_wpa_version (psecuritypriv, sme->crypto.wpa_versions);
drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1
@@ -531,7 +531,7 @@ static void rtw_init_default_value(struct adapter *padapter) psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt; psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt; - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* open system */ psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psecuritypriv->dot11PrivacyKeyIndex =0 ;
Signature · 1 line
2.54.0
PATCH v3 3/5 staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Auto
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum value dot11AuthAlgrthm_Auto to dot11_auth_algrthm_auto to fix checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -858,7 +858,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram status =le16_to_cpu (*(__le16 *)((SIZE_PTR )pframe +WLAN_HDR_A3_LEN + offset +4 ));if (status !=0 ) { -if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11AuthAlgrthm_Auto) */ +if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11_auth_algrthm_auto) */ if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) pmlmeinfo->auth_algo = dot11_auth_algrthm_open;else
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -526,7 +526,7 @@ static int update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pswitch (psecuritypriv->dot11_auth_algrthm) {case dot11_auth_algrthm_open:case dot11AuthAlgrthm_Shared: -case dot11AuthAlgrthm_Auto: +case dot11_auth_algrthm_auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;break ;case dot11_auth_algrthm_8021x:
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -47,7 +47,7 @@ enum { dot11_auth_algrthm_open =0 , dot11AuthAlgrthm_Shared, dot11_auth_algrthm_8021x, - dot11AuthAlgrthm_Auto, + dot11_auth_algrthm_auto, dot11AuthAlgrthm_WAPI, dot11AuthAlgrthm_MaxNum };
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -173,7 +173,7 @@ do {\switch (psecuritypriv->dot11_auth_algrthm) {\case dot11_auth_algrthm_open:\case dot11AuthAlgrthm_Shared:\ -case dot11AuthAlgrthm_Auto:\ +case dot11_auth_algrthm_auto:\ encry_algo = (u8 )psecuritypriv->dot11PrivacyAlgrthm;\break ;\case dot11_auth_algrthm_8021x:\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +3 -3
@@ -539,7 +539,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->dot11_auth_algrthm = dot11AuthAlgrthm_Auto; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_auto; psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled; psecuritypriv->dot11PrivacyAlgrthm = _WEP40_; psecuritypriv->dot118021XGrpPrivacy = _WEP40_;
@@ -1310,7 +1310,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,switch (sme_auth_type) {case NL80211_AUTHTYPE_AUTOMATIC : - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Auto; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_auto;break ;case NL80211_AUTHTYPE_OPEN_SYSTEM :
@@ -1683,7 +1683,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,/* For WEP Shared auth */ if ((psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_Shared || - psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_Auto) && sme->key) { + psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_auto) && sme->key) {u32 wep_key_idx, wep_key_len, wep_total_len;struct ndis_802_11_wep *pwep =NULL ;
Signature · 1 line
2.54.0
PATCH v3 4/5 staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Shared
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum value dot11AuthAlgrthm_Shared to dot11_auth_algrthm_shared to fix checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 10 +++++----- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +5 -5
@@ -859,10 +859,10 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_framif (status !=0 ) {if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11_auth_algrthm_auto) */ -if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) +if (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) pmlmeinfo->auth_algo = dot11_auth_algrthm_open;else - pmlmeinfo->auth_algo = dot11AuthAlgrthm_Shared; + pmlmeinfo->auth_algo = dot11_auth_algrthm_shared;/* pmlmeinfo->reauth_count = 0; */ }
@@ -871,7 +871,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram }if (seq ==2 ) { -if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) { +if (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) {/* legendary shared system */ p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_,WLAN_EID_CHALLENGE , (int *)&len, pkt_len -WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);
@@ -889,7 +889,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram/* open system */ go2asoc =1 ; }else if (seq ==4 ) { -if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) +if (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) go2asoc =1 ;else goto authclnt_fail;
@@ -2577,7 +2577,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned shortmemcpy (pwlanhdr->addr3,get_my_bssid (&pmlmeinfo->network),ETH_ALEN );/* setting auth algo number */ - val16 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) ?1 :0 ;/* 0:OPEN System, 1:Shared key */ + val16 = (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) ?1 :0 ;/* 0:OPEN System, 1:Shared key */ if (val16) use_shared_key =1 ; le_tmp =cpu_to_le16 (val16);
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -525,7 +525,7 @@ static int update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pswitch (psecuritypriv->dot11_auth_algrthm) {case dot11_auth_algrthm_open: -case dot11AuthAlgrthm_Shared: +case dot11_auth_algrthm_shared:case dot11_auth_algrthm_auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;break ;
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -45,7 +45,7 @@enum { dot11_auth_algrthm_open =0 , - dot11AuthAlgrthm_Shared, + dot11_auth_algrthm_shared, dot11_auth_algrthm_8021x, dot11_auth_algrthm_auto, dot11AuthAlgrthm_WAPI,
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -172,7 +172,7 @@ struct security_priv { do {\ switch (psecuritypriv->dot11_auth_algrthm) {\ case dot11_auth_algrthm_open:\ - case dot11AuthAlgrthm_Shared:\ + case dot11_auth_algrthm_shared:\ case dot11_auth_algrthm_auto:\ encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\ break;\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -2
@@ -1323,7 +1323,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,break ;case NL80211_AUTHTYPE_SHARED_KEY : - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Shared; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_shared; psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled;
@@ -1682,7 +1682,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, }/* For WEP Shared auth */ -if ((psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_Shared || +if ((psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_shared || psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_auto) && sme->key) {u32 wep_key_idx, wep_key_len, wep_total_len;struct ndis_802_11_wep *pwep =NULL ;
Signature · 1 line
2.54.0
PATCH v3 5/5 staging: rtl8723bs: Rename camelcase enum values dot11AuthAlgrthm_WAPI and dot11AuthAlgrthm_MaxNum
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum values dot11AuthAlgrthm_WAPI and dot11AuthAlgrthm_MaxNum to fix checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/include/rtw_mlme.h | 4 ++-- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/include/rtw_mlme.h +2 -2
@@ -48,8 +48,8 @@ enum { dot11_auth_algrthm_shared, dot11_auth_algrthm_8021x, dot11_auth_algrthm_auto, - dot11AuthAlgrthm_WAPI, - dot11AuthAlgrthm_MaxNum + dot11_auth_algrthm_wapi, + dot11_auth_algrthm_maxnum };/* Scan type including active and passive scan. */
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -182,7 +182,7 @@ do {\ else\ encry_algo = (u8 )psta->dot118021XPrivacy;\break ;\ -case dot11AuthAlgrthm_WAPI:\ +case dot11_auth_algrthm_wapi:\ encry_algo = (u8 )psecuritypriv->dot11PrivacyAlgrthm;\break ;\ } \
Signature · 1 line
2.54.0
Greg KH
maintainerRe: [PATCH v3 0/5] Rename camelcase enum values dot11AuthAlgrthm_
In reply to [email protected]Quoted 19 lines · On Fri, Jul 10, 2026 at 10:45:24AM +0000, [email protected] wrote:
From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
This patch series renames camelcase enum values in the rtl8723bs driver to address checkpatch.pl CamelCase warnings. It also replaces spaces with tabs where required by the kernel coding style.
Changes in v3:
- Dropped v2 2/6 as changes are already in staging tree after rebase or unnecessaryDalvin-Ehinoma Noah Aiguobas (5):
staging: rtl8723bs: Rename camelcase enum valuedot11AuthAlgrthm_8021X
staging: rtl8723bs: Rename camelcase enum valuedot11AuthAlgrthm_Open
staging: rtl8723bs: Rename camelcase enum valuedot11AuthAlgrthm_Auto
staging: rtl8723bs: Rename camelcase enum value
dot11AuthAlgrthm_Shared
staging: rtl8723bs: Rename camelcase enum valuesdot11AuthAlgrthm_WAPI
anddot11AuthAlgrthm_MaxNum
Quoted 17 lines
drivers/staging/rtl8723bs/core/rtw_ap.c | 8 ++--- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 18 +++++------ drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 8 ++--- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 12 +++---- .../staging/rtl8723bs/include/rtw_security.h | 10 +++--- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 32 +++++++++---------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 11 files changed, 53 insertions(+), 53 deletions(-)Signature · 1 line
2.54.0
Can you rebase this against my staging-testing branch and resend? It currently does not apply cleanly.
thanks,
gre gk-h
v4 cover staging: rtl8723bs: Rename camelcase enum values dot11AuthAlgrthm_
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
This patch series resolves the camelcase checkpatch issue for several values within an enum.
Changes in v4:
- Rebased against staging-testing
Dalvin-Ehinoma Noah Aiguobas (5):
staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_8021X
staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Open
staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Auto
staging: rtl8723bs: Rename camelcase enum value
dot11AuthAlgrthm_Shared
staging: rtl8723bs: Rename camelcase enum values dot11AuthAlgrthm_WAPI
and dot11AuthAlgrthm_MaxNum
drivers/staging/rtl8723bs/core/rtw_ap.c | 8 ++--- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 18 +++++------ drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 8 ++--- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 12 +++---- .../staging/rtl8723bs/include/rtw_security.h | 10 +++--- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 32 +++++++++---------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 11 files changed, 53 insertions(+), 53 deletions(-)
Signature · 1 line
2.54.0
PATCH v4 1/5 staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_8021X
From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum value dot11AuthAlgrthm_8021X to dot11_auth_algrthm_8021x to fix the checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 14 +++++++------- 10 files changed, 22 insertions(+), 22 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->dot11_auth_algrthm == dot11AuthAlgrthm_8021X) +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021x) psta->ieee8021x_blocked = true;else psta->ieee8021x_blocked = false;
@@ -674,7 +674,7 @@ void start_bss_network(struct adapter *padapter)/* Set Security */ val8 = (psecuritypriv->dot11_auth_algrthm == - dot11AuthAlgrthm_8021X) ?0xcc :0xcf ; + dot11_auth_algrthm_8021x) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));/* Beacon Control related register */
@@ -872,7 +872,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) { - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_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->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; psecuritypriv->dot8021xalg =1 ;/* psk, todo:802.1x */
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -1
@@ -398,7 +398,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11 psecuritypriv->ndisauthtype = authmode;if (psecuritypriv->ndisauthtype >3 ) - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; res =rtw_set_auth (padapter, psecuritypriv);
drivers/staging/rtl8723bs/core/rtw_mlme.c +4 -4
@@ -972,7 +972,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.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) { +if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) { padapter->securitypriv.binstallGrpkey = false; padapter->securitypriv.busetkipkey = false; padapter->securitypriv.bgrpkey_handshake = false;
@@ -1085,7 +1085,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)spin_lock_bh (&adapter->security_key_mutex); -if (adapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) { +if (adapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) {/* 802.1x */ /* Added by Albert 2009/02/18 */ /* We have to backup the PMK information for WiFi PMK Caching test item. */
@@ -1334,7 +1334,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)rtw_sta_media_status_rpt (adapter, psta,1 ); -if (adapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) +if (adapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) psta->dot118021XPrivacy = adapter->securitypriv.dot11_privacy_algrthm; psta->ieee8021x_blocked = false;
@@ -1887,7 +1887,7 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp goto exit; } -if (psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_8021X) +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021x) psetkeyparm->algorithm = (unsigned char )psecuritypriv->dot118021XGrpPrivacy;else psetkeyparm->algorithm = (u8 )psecuritypriv->dot11_privacy_algrthm;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -4033,7 +4033,7 @@ void start_clnt_join(struct adapter *padapter)if (caps &WLAN_CAPABILITY_ESS ) {set_msr (padapter,WIFI_FW_STATION_STATE ); - val8 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X) ?0xcc :0xcf ; + val8 = (pmlmeinfo->auth_algo == dot11_auth_algrthm_8021x) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));
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.dot11_auth_algrthm == dot11AuthAlgrthm_8021X && +if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x && !padapter->securitypriv.binstallGrpkey)return false;
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -529,7 +529,7 @@ static int update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pcase dot11AuthAlgrthm_Auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;break ; -case dot11AuthAlgrthm_8021X: +case dot11_auth_algrthm_8021x:if (bmcast) pattrib->key_idx = (u8 )psecuritypriv->dot118021XGrpKeyid;else
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->dot11_auth_algrthm != dot11AuthAlgrthm_8021X) +if (sec->dot11_auth_algrthm != dot11_auth_algrthm_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_mlme.h +1 -1
@@ -46,7 +46,7 @@enum { dot11AuthAlgrthm_Open =0 , dot11AuthAlgrthm_Shared, - dot11AuthAlgrthm_8021X, + dot11_auth_algrthm_8021x, dot11AuthAlgrthm_Auto, dot11AuthAlgrthm_WAPI, dot11AuthAlgrthm_MaxNum
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -176,7 +176,7 @@ do {\case dot11AuthAlgrthm_Auto:\ encry_algo = (u8 )psecuritypriv->dot11_privacy_algrthm;\break ;\ -case dot11AuthAlgrthm_8021X:\ +case dot11_auth_algrthm_8021x:\if (bmcst)\ encry_algo = (u8 )psecuritypriv->dot118021XGrpPrivacy;\else \
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +7 -7
@@ -609,7 +609,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa goto exit; } -if (psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_8021X && psta) {/* psk/802_1x */ +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_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));
@@ -757,7 +757,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param goto exit; } -if (padapter->securitypriv.dot11_auth_algrthm == dot11AuthAlgrthm_8021X) {/* 802_1x */ +if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) {/* 802_1x */ struct sta_info *psta, *pbcmc_sta;struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1318,7 +1318,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv, psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;if (psecuritypriv->ndisauthtype > Ndis802_11AuthModeWPA) - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x;break ;case NL80211_AUTHTYPE_SHARED_KEY :
@@ -1388,9 +1388,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->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x;else if (key_mgt ==WLAN_AKM_SUITE_PSK ) { - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; }return 0 ;
@@ -1431,7 +1431,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.dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + padapter->securitypriv.dot11_auth_algrthm = dot11_auth_algrthm_8021x; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPAPSK;memcpy (padapter->securitypriv.supplicant_ie, &pwpa[0 ], wpa_ielen +2 ); }
@@ -1440,7 +1440,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.dot11_auth_algrthm = dot11AuthAlgrthm_8021X; + padapter->securitypriv.dot11_auth_algrthm = dot11_auth_algrthm_8021x; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPA2PSK;memcpy (padapter->securitypriv.supplicant_ie, &pwpa2[0 ], wpa2_ielen +2 ); }
Signature · 1 line
2.54.0
PATCH v4 2/5 staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Open
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum value dot11AuthAlgrthm_Open to dot11_auth_algrthm_open in enum to fix checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 ++++---- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
@@ -1119,7 +1119,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)/* */ struct security_priv *psec_priv = &adapter->securitypriv; - psec_priv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ + psec_priv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* open system */ psec_priv->dot11_privacy_algrthm = _NO_PRIVACY_; psec_priv->dot11PrivacyKeyIndex =0 ;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -2
@@ -237,7 +237,7 @@ static void init_mlme_ext_priv_value(struct adapter *padapter) pmlmeinfo->reassoc_count =0 ; pmlmeinfo->link_count =0 ; pmlmeinfo->auth_seq =0 ; - pmlmeinfo->auth_algo = dot11AuthAlgrthm_Open; + pmlmeinfo->auth_algo = dot11_auth_algrthm_open; pmlmeinfo->key_index =0 ; pmlmeinfo->iv =0 ;
@@ -863,7 +863,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_framif (status !=0 ) {if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11AuthAlgrthm_Auto) */ if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) - pmlmeinfo->auth_algo = dot11AuthAlgrthm_Open; + pmlmeinfo->auth_algo = dot11_auth_algrthm_open;else pmlmeinfo->auth_algo = dot11AuthAlgrthm_Shared;/* pmlmeinfo->reauth_count = 0; */
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -524,7 +524,7 @@ static int update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pGET_ENCRY_ALGO (psecuritypriv, psta, pattrib->encrypt, bmcast);switch (psecuritypriv->dot11_auth_algrthm) { -case dot11AuthAlgrthm_Open: +case dot11_auth_algrthm_open:case dot11AuthAlgrthm_Shared:case dot11AuthAlgrthm_Auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -44,7 +44,7 @@enum { - dot11AuthAlgrthm_Open =0 , + dot11_auth_algrthm_open =0 , dot11AuthAlgrthm_Shared, dot11_auth_algrthm_8021x, dot11AuthAlgrthm_Auto,
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -171,7 +171,7 @@ struct security_priv {#define GET_ENCRY_ALGO (psecuritypriv, psta, encry_algo, bmcst)\ do {\ switch (psecuritypriv->dot11_auth_algrthm) {\ - case dot11AuthAlgrthm_Open:\ + case dot11_auth_algrthm_open:\ case dot11AuthAlgrthm_Shared:\ case dot11AuthAlgrthm_Auto:\ encry_algo = (u8)psecuritypriv->dot11_privacy_algrthm;\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +4 -4
@@ -1315,7 +1315,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,break ;case NL80211_AUTHTYPE_OPEN_SYSTEM : - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;if (psecuritypriv->ndisauthtype > Ndis802_11AuthModeWPA) psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x;
@@ -1329,7 +1329,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,break ;default : - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* return -ENOTSUPP; */ }
@@ -1563,7 +1563,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev, psecuritypriv->ndisencryptstatus = Ndis802_11EncryptionDisabled; psecuritypriv->dot11_privacy_algrthm = _NO_PRIVACY_; psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* open system */ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; ret =rtw_cfg80211_set_auth_type (psecuritypriv,NL80211_AUTHTYPE_OPEN_SYSTEM );
@@ -1659,7 +1659,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, psecuritypriv->ndisencryptstatus = Ndis802_11EncryptionDisabled; psecuritypriv->dot11_privacy_algrthm = _NO_PRIVACY_; psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* open system */ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; ret =rtw_cfg80211_set_wpa_version (psecuritypriv, sme->crypto.wpa_versions);
drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1
@@ -531,7 +531,7 @@ static void rtw_init_default_value(struct adapter *padapter) psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt; psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt; - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_open;/* open system */ psecuritypriv->dot11_privacy_algrthm = _NO_PRIVACY_; psecuritypriv->dot11PrivacyKeyIndex =0 ;
Signature · 1 line
2.54.0
PATCH v4 3/5 staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Auto
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum value dot11AuthAlgrthm_Auto to dot11_auth_algrthm_auto to fix checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -861,7 +861,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram status =le16_to_cpu (*(__le16 *)((SIZE_PTR )pframe +WLAN_HDR_A3_LEN + offset +4 ));if (status !=0 ) { -if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11AuthAlgrthm_Auto) */ +if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11_auth_algrthm_auto) */ if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) pmlmeinfo->auth_algo = dot11_auth_algrthm_open;else
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -526,7 +526,7 @@ static int update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pswitch (psecuritypriv->dot11_auth_algrthm) {case dot11_auth_algrthm_open:case dot11AuthAlgrthm_Shared: -case dot11AuthAlgrthm_Auto: +case dot11_auth_algrthm_auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;break ;case dot11_auth_algrthm_8021x:
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -47,7 +47,7 @@ enum { dot11_auth_algrthm_open =0 , dot11AuthAlgrthm_Shared, dot11_auth_algrthm_8021x, - dot11AuthAlgrthm_Auto, + dot11_auth_algrthm_auto, dot11AuthAlgrthm_WAPI, dot11AuthAlgrthm_MaxNum };
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -173,7 +173,7 @@ do {\switch (psecuritypriv->dot11_auth_algrthm) {\case dot11_auth_algrthm_open:\case dot11AuthAlgrthm_Shared:\ -case dot11AuthAlgrthm_Auto:\ +case dot11_auth_algrthm_auto:\ encry_algo = (u8 )psecuritypriv->dot11_privacy_algrthm;\break ;\case dot11_auth_algrthm_8021x:\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +3 -3
@@ -539,7 +539,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->dot11_auth_algrthm = dot11AuthAlgrthm_Auto; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_auto; psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled; psecuritypriv->dot11_privacy_algrthm = _WEP40_; psecuritypriv->dot118021XGrpPrivacy = _WEP40_;
@@ -1310,7 +1310,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,switch (sme_auth_type) {case NL80211_AUTHTYPE_AUTOMATIC : - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Auto; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_auto;break ;case NL80211_AUTHTYPE_OPEN_SYSTEM :
@@ -1683,7 +1683,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,/* For WEP Shared auth */ if ((psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_Shared || - psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_Auto) && sme->key) { + psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_auto) && sme->key) {u32 wep_key_idx, wep_key_len, wep_total_len;struct ndis_802_11_wep *pwep =NULL ;
Signature · 1 line
2.54.0
PATCH v4 4/5 staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_Shared
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum value dot11AuthAlgrthm_Shared to dot11_auth_algrthm_shared to fix checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 10 +++++----- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +5 -5
@@ -862,10 +862,10 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_framif (status !=0 ) {if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11_auth_algrthm_auto) */ -if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) +if (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) pmlmeinfo->auth_algo = dot11_auth_algrthm_open;else - pmlmeinfo->auth_algo = dot11AuthAlgrthm_Shared; + pmlmeinfo->auth_algo = dot11_auth_algrthm_shared;/* pmlmeinfo->reauth_count = 0; */ }
@@ -874,7 +874,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram }if (seq ==2 ) { -if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) { +if (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) {/* legendary shared system */ p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_,WLAN_EID_CHALLENGE , (int *)&len, pkt_len -WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);
@@ -892,7 +892,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram/* open system */ go2asoc =1 ; }else if (seq ==4 ) { -if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) +if (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) go2asoc =1 ;else goto authclnt_fail;
@@ -2593,7 +2593,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned shortmemcpy (pwlanhdr->addr3,get_my_bssid (&pmlmeinfo->network),ETH_ALEN );/* setting auth algo number */ - val16 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) ?1 :0 ;/* 0:OPEN System, 1:Shared key */ + val16 = (pmlmeinfo->auth_algo == dot11_auth_algrthm_shared) ?1 :0 ;/* 0:OPEN System, 1:Shared key */ if (val16) use_shared_key =1 ; le_tmp =cpu_to_le16 (val16);
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -525,7 +525,7 @@ static int update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pswitch (psecuritypriv->dot11_auth_algrthm) {case dot11_auth_algrthm_open: -case dot11AuthAlgrthm_Shared: +case dot11_auth_algrthm_shared:case dot11_auth_algrthm_auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;break ;
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -45,7 +45,7 @@enum { dot11_auth_algrthm_open =0 , - dot11AuthAlgrthm_Shared, + dot11_auth_algrthm_shared, dot11_auth_algrthm_8021x, dot11_auth_algrthm_auto, dot11AuthAlgrthm_WAPI,
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -172,7 +172,7 @@ struct security_priv { do {\ switch (psecuritypriv->dot11_auth_algrthm) {\ case dot11_auth_algrthm_open:\ - case dot11AuthAlgrthm_Shared:\ + case dot11_auth_algrthm_shared:\ case dot11_auth_algrthm_auto:\ encry_algo = (u8)psecuritypriv->dot11_privacy_algrthm;\ break;\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -2
@@ -1323,7 +1323,7 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,break ;case NL80211_AUTHTYPE_SHARED_KEY : - psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Shared; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_shared; psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled;
@@ -1682,7 +1682,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, }/* For WEP Shared auth */ -if ((psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_Shared || +if ((psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_shared || psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_auto) && sme->key) {u32 wep_key_idx, wep_key_len, wep_total_len;struct ndis_802_11_wep *pwep =NULL ;
Signature · 1 line
2.54.0
PATCH v4 5/5 staging: rtl8723bs: Rename camelcase enum values dot11AuthAlgrthm_WAPI and dot11AuthAlgrthm_MaxNum
In reply to [email protected]From: Dalvin-Ehinoma Noah Aiguobas <[email protected]>
Rename enum values dot11AuthAlgrthm_WAPI and dot11AuthAlgrthm_MaxNum to fix checkpatch.pl CamelCase finding.
--- drivers/staging/rtl8723bs/include/rtw_mlme.h | 4 ++-- drivers/staging/rtl8723bs/include/rtw_security.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/include/rtw_mlme.h +2 -2
@@ -48,8 +48,8 @@ enum { dot11_auth_algrthm_shared, dot11_auth_algrthm_8021x, dot11_auth_algrthm_auto, - dot11AuthAlgrthm_WAPI, - dot11AuthAlgrthm_MaxNum + dot11_auth_algrthm_wapi, + dot11_auth_algrthm_maxnum };/* Scan type including active and passive scan. */
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -182,7 +182,7 @@ do {\ else\ encry_algo = (u8 )psta->dot118021XPrivacy;\break ;\ -case dot11AuthAlgrthm_WAPI:\ +case dot11_auth_algrthm_wapi:\ encry_algo = (u8 )psecuritypriv->dot11_privacy_algrthm;\break ;\ } \
Signature · 1 line
2.54.0