mirror of
https://github.com/torvalds/linux.git
synced 2026-10-10 20:38:02 +02:00
staging: rtl8723bs: Rename camelcase enum value dot11AuthAlgrthm_8021X
Rename enum value dot11AuthAlgrthm_8021X to dot11_auth_algrthm_8021x to fix the checkpatch.pl CamelCase finding. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas <fliegbert2@gmail.com> Link: https://patch.msgid.link/20260710162017.5660-2-fliegbert2@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
64276d9bfe
commit
9c4e4ef324
|
|
@ -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 */
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -972,7 +972,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
|
|||
rtw_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;
|
||||
|
|
|
|||
|
|
@ -4047,7 +4047,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));
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -529,7 +529,7 @@ static int update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *p
|
|||
case 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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
enum {
|
||||
dot11AuthAlgrthm_Open = 0,
|
||||
dot11AuthAlgrthm_Shared,
|
||||
dot11AuthAlgrthm_8021X,
|
||||
dot11_auth_algrthm_8021x,
|
||||
dot11AuthAlgrthm_Auto,
|
||||
dot11AuthAlgrthm_WAPI,
|
||||
dot11AuthAlgrthm_MaxNum
|
||||
|
|
|
|||
|
|
@ -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\
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -1435,7 +1435,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel
|
|||
goto exit;
|
||||
}
|
||||
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);
|
||||
}
|
||||
|
|
@ -1448,7 +1448,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel
|
|||
goto exit;
|
||||
}
|
||||
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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user