From nobody Mon Jun 8 08:28:03 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C21E129BD95 for ; Sun, 31 May 2026 10:04:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780221866; cv=none; b=lxC6fGAJ3MKInwp/bgEfe8arLOfjM9LNl1r9vavSToNjsNiq3yRou28IXPlmEIwx7CgoctljZMYCspfiffhGTQ85BW+CkhGZR4EkqvabpvJrPYLcda11ob6XT3F1zRIe3b8gy0NggwBX/lnAKXmpsGHMiZo1Q53+E+MxqQZ9cng= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780221866; c=relaxed/simple; bh=UydcxuhqpVIuc8roeQi9f4M4Ic7JU0CIyc/DAcSoY+0=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=gNyzaXrUQzUeGR2AqncMQaRF93SuM1iLFCNeRTHHlVDJSzdp4VyPdpTq2ocL6+EUfyJeF0nEwFY0U4LlJn4srDwCXNfDhewvTzIxUTXB8M7N/JW0mqmrPPkkKhXMSzODKck42T+2h3qgz3lxHOg25e0Rc9KbhEA2HWMdt6fU/0M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RDjUX/S9; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RDjUX/S9" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-490a7682635so4781885e9.3 for ; Sun, 31 May 2026 03:04:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780221863; x=1780826663; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=bBUBNEgRmt/dQgTKa0WbswbbUxf0LVatIhCfU6UZ2sY=; b=RDjUX/S9bDbkZlzmpD7ABcvJ75xpW48lDyDLN36gWf62Xn730/g2iJncRtnJgB2fX9 zjdrbEdtk37Up8gA+2D5kmXXyPl0v4Ton8gAC3gafK5jJWabf7xRK4q2hr+dT/SxcweG EHAZPhUg8W9CpAhaGJ6pQRoxlVqfe1lZ1jB+SM8FhZ0jrlaE1PxI7OIm/ZJCqcAWKvE9 maNvgdnM6xp9Yp/E7CT9TPZlSLTWzcyhmddh9T3VjfA0If+0bcosVmR0DuEWl6ZvPs1+ OSstNXdSavTHEJ8M8i67/HHuqcZFxkgl//H/MqKqx+V/C8kg/KBHTCGiusW6P18necZV XD8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780221863; x=1780826663; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bBUBNEgRmt/dQgTKa0WbswbbUxf0LVatIhCfU6UZ2sY=; b=KTrSVngRiAfzOU78u8yKW+ioumkDXo5pD1iAlyXeqedPuKTRBJTTg5my5xnSm/tPFn x3Zh9hFzM1XTJoYLTeqY+KesjzS7JDn21WTyrJVGhBfs3aE4BdaPN5JaAtEvUtlxcCVj fjJcYo0zuG0hRk8fbO/gMwAgySoj2A70Csq2U3REecIpT4bnglnHeMe2t6ZShnVVKVn9 2EOUfreD7XuShXcMBe6ceQ85tw0ks+nuFji9yLUMdaG1T4obw7QseHpZOug59yczv1y8 uZweEFatlIFOlXS/9GHX3FxDtGpOyLIYtIr4kVwZFuRTUuO+SZbFGdTkdbTa1oLgJoVp 8CCQ== X-Forwarded-Encrypted: i=1; AFNElJ/MtrFYVpGLHD7CeG2SFm10J0CHm96jwfbnetQPiZVGyo3+22X4RQJdk8lErO02lAYeAL5r5CFwVzDEuO0=@vger.kernel.org X-Gm-Message-State: AOJu0Yzb4BSEftTJ/PuDPF6nLJou/PNfklZcUdY563fDTYzaavrR4DXb 41i1jWyxn1KTzZExrPT1BTtjMzz7YeR96PdvbPk2C+Ak46ALPTfeVUFFZazhhJB/lVQ= X-Gm-Gg: Acq92OGC2IKFZw8J4kGyUm5LdRDHhDxT+GOHx95T34OBPoOwZb2OfigJl+jQ3Am2at9 2Mrxqn0Cpn8oGFkTR1ed/KG4l/eg05t+KZc8MOTbqx4k2e9ALs896Jk4kVCbjcqcIPOZYNwyUp5 aD71UHM2OMJc0MJJuoLkdooYM8bDxGgzYlTpfPDDniRKMCYIf7caSr46vU0WIgLkqrdl9ZmLRyi EQJLXxQv1ri/99jnSJCf9gMnlP0BCFkFch9cfOruZhaREuT/u5BvhDVFy5NEiwcESPP5lYxDFEu TH915oiGB0XCYG4JtHKjLtCv4VPvreJ7cgsHJtVPn6nBnjV+k2e0kOT/hD7KH5f2ryGUtP3hGeb KEsTogHjNWQrR2hTeWFnSyMs9SCabTTkjilX2/4o2rNQCXJaZH8oc7eAAk60Viplve0uBw5GzU+ FI+hOJUeg3mTnN9sUOoPOsFdBRcxJPWjRHVba/5secfmjO0IinVyJnr3zFukymiC8Vo0zaIGIWM XTebnDMgXDNteFa X-Received: by 2002:a05:600c:450b:b0:490:3fa2:1b93 with SMTP id 5b1f17b1804b1-490a291fa5bmr130950695e9.13.1780221862758; Sun, 31 May 2026 03:04:22 -0700 (PDT) Received: from localhost (dslb-002-204-131-161.002.204.pools.vodafone-ip.de. [2.204.131.161]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4909c123406sm67367605e9.5.2026.05.31.03.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2026 03:04:22 -0700 (PDT) Date: Sun, 31 May 2026 10:03:24 +0000 From: Dalvin-Ehinoma Noah Aiguobas To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] staging: rtl8723bs: Rename camelcase variable dot11AuthAlgrthm Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable dot11AuthAlgrthm to dot11_auth_algrthm in struct security_priv to resolve checkpatch.pl CamelCase finding. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas --- drivers/staging/rtl8723bs/core/rtw_ap.c | 8 ++--- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 12 +++---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- .../staging/rtl8723bs/include/rtw_security.h | 4 +-- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 32 +++++++++---------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8= 723bs/core/rtw_ap.c index 065850a9e894..dd361714f9ac 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -447,7 +447,7 @@ void update_sta_info_apmode(struct adapter *padapter, s= truct sta_info *psta) /* ap mode */ rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true); =20 - if (psecuritypriv->dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021X) + if (psecuritypriv->dot11_auth_algrthm =3D=3D dot11AuthAlgrthm_8021X) psta->ieee8021x_blocked =3D true; else psta->ieee8021x_blocked =3D false; @@ -673,7 +673,7 @@ void start_bss_network(struct adapter *padapter) rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_BK, (u8 *)(&acparm)); =20 /* Set Security */ - val8 =3D (psecuritypriv->dot11AuthAlgrthm =3D=3D + val8 =3D (psecuritypriv->dot11_auth_algrthm =3D=3D dot11AuthAlgrthm_8021X) ? 0xcc : 0xcf; rtw_hal_set_hwreg(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8)); =20 @@ -872,7 +872,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 = *pbuf, int len) &group_cipher, &pairwise_cipher, NULL) =3D=3D _SUCCESS) { - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_8021X; =20 psecuritypriv->dot8021xalg =3D 1;/* psk, todo:802.1x */ psecuritypriv->wpa_psk |=3D BIT(1); @@ -898,7 +898,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 = *pbuf, int len) &group_cipher, &pairwise_cipher, NULL) =3D=3D _SUCCESS) { - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_8021X; =20 psecuritypriv->dot8021xalg =3D 1;/* psk, todo:802.1x */ =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/stagi= ng/rtl8723bs/core/rtw_ioctl_set.c index 12bf7780bea5..85f50ef44812 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c @@ -400,7 +400,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *p= adapter, enum ndis_802_11 psecuritypriv->ndisauthtype =3D authmode; =20 if (psecuritypriv->ndisauthtype > 3) - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_8021X; =20 res =3D rtw_set_auth(padapter, psecuritypriv); =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 4fb74729180f..20611d10a6bf 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -969,7 +969,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(stru= ct adapter *padapter, str rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true); =20 /* security related */ - if (padapter->securitypriv.dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021= X) { + if (padapter->securitypriv.dot11_auth_algrthm =3D=3D dot11AuthAlgrthm_80= 21X) { padapter->securitypriv.binstallGrpkey =3D false; padapter->securitypriv.busetkipkey =3D false; padapter->securitypriv.bgrpkey_handshake =3D false; @@ -1080,7 +1080,7 @@ void rtw_reset_securitypriv(struct adapter *adapter) =20 spin_lock_bh(&adapter->security_key_mutex); =20 - if (adapter->securitypriv.dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021X)= { + if (adapter->securitypriv.dot11_auth_algrthm =3D=3D dot11AuthAlgrthm_8021= X) { /* 802.1x */ /* Added by Albert 2009/02/18 */ /* We have to backup the PMK information for WiFi PMK Caching test item= . */ @@ -1114,7 +1114,7 @@ void rtw_reset_securitypriv(struct adapter *adapter) /* */ struct security_priv *psec_priv =3D &adapter->securitypriv; =20 - psec_priv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Open; /* open system */ + psec_priv->dot11_auth_algrthm =3D dot11AuthAlgrthm_Open; /* open system= */ psec_priv->dot11PrivacyAlgrthm =3D _NO_PRIVACY_; psec_priv->dot11PrivacyKeyIndex =3D 0; =20 @@ -1330,7 +1330,7 @@ void rtw_stassoc_event_callback(struct adapter *adapt= er, u8 *pbuf) =20 rtw_sta_media_status_rpt(adapter, psta, 1); =20 - if (adapter->securitypriv.dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021X) + if (adapter->securitypriv.dot11_auth_algrthm =3D=3D dot11AuthAlgrthm_8021= X) psta->dot118021XPrivacy =3D adapter->securitypriv.dot11PrivacyAlgrthm; =20 psta->ieee8021x_blocked =3D false; @@ -1853,7 +1853,7 @@ signed int rtw_set_auth(struct adapter *adapter, stru= ct security_priv *psecurity goto exit; } =20 - psetauthparm->mode =3D (unsigned char)psecuritypriv->dot11AuthAlgrthm; + psetauthparm->mode =3D (unsigned char)psecuritypriv->dot11_auth_algrthm; =20 pcmd->cmdcode =3D _SetAuth_CMD_; pcmd->parmbuf =3D (unsigned char *)psetauthparm; @@ -1883,7 +1883,7 @@ signed int rtw_set_key(struct adapter *adapter, struc= t security_priv *psecurityp goto exit; } =20 - if (psecuritypriv->dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021X) + if (psecuritypriv->dot11_auth_algrthm =3D=3D dot11AuthAlgrthm_8021X) psetkeyparm->algorithm =3D (unsigned char)psecuritypriv->dot118021XGrpPr= ivacy; else psetkeyparm->algorithm =3D (u8)psecuritypriv->dot11PrivacyAlgrthm; diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index a86d6f97cf02..d91dc408277d 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -679,7 +679,7 @@ unsigned int OnAuth(struct adapter *padapter, union rec= v_frame *precv_frame) =20 sa =3D GetAddr2Ptr(pframe); =20 - auth_mode =3D psecuritypriv->dot11AuthAlgrthm; + auth_mode =3D psecuritypriv->dot11_auth_algrthm; =20 if (GetPrivacy(pframe)) { u8 *iv; diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging= /rtl8723bs/core/rtw_pwrctrl.c index b9f8cf1014ed..60174361761f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -315,7 +315,7 @@ static u8 PS_RDY_CHECK(struct adapter *padapter) ) return false; =20 - if (padapter->securitypriv.dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021X= && + if (padapter->securitypriv.dot11_auth_algrthm =3D=3D dot11AuthAlgrthm_802= 1X && !padapter->securitypriv.binstallGrpkey) return false; =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index 86c5e2c4e7dd..69ac683b2b9b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -494,7 +494,7 @@ static union recv_frame *portctrl(struct adapter *adapt= er, union recv_frame *pre =20 pstapriv =3D &adapter->stapriv; =20 - auth_alg =3D adapter->securitypriv.dot11AuthAlgrthm; + auth_alg =3D adapter->securitypriv.dot11_auth_algrthm; =20 ptr =3D precv_frame->u.hdr.rx_data; pfhdr =3D &precv_frame->u.hdr; diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index 444966c0de7f..1d32a6d2e434 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -526,7 +526,7 @@ static s32 update_attrib_sec_info(struct adapter *padap= ter, struct pkt_attrib *p } else { GET_ENCRY_ALGO(psecuritypriv, psta, pattrib->encrypt, bmcast); =20 - switch (psecuritypriv->dot11AuthAlgrthm) { + switch (psecuritypriv->dot11_auth_algrthm) { case dot11AuthAlgrthm_Open: case dot11AuthAlgrthm_Shared: case dot11AuthAlgrthm_Auto: diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8= 723bs/hal/hal_com.c index 634af4657eee..3bfe69f4a1fe 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com.c +++ b/drivers/staging/rtl8723bs/hal/hal_com.c @@ -548,7 +548,7 @@ void SetHwReg(struct adapter *adapter, u8 variable, u8 = *val) =20 if (val) { /* Enable default key related setting */ reg_scr |=3D SCR_TXBCUSEDK; - if (sec->dot11AuthAlgrthm !=3D dot11AuthAlgrthm_8021X) + if (sec->dot11_auth_algrthm !=3D dot11AuthAlgrthm_8021X) reg_scr |=3D (SCR_RxUseDK|SCR_TxUseDK); } else /* Disable default key related setting */ reg_scr &=3D ~(SCR_RXBCUSEDK|SCR_TXBCUSEDK|SCR_RxUseDK|SCR_TxUseDK); diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/sta= ging/rtl8723bs/include/rtw_security.h index 32f6d3a5e309..7b92f7e4ce71 100644 --- a/drivers/staging/rtl8723bs/include/rtw_security.h +++ b/drivers/staging/rtl8723bs/include/rtw_security.h @@ -91,7 +91,7 @@ struct rt_pmkid_list { =20 =20 struct security_priv { - u32 dot11AuthAlgrthm; /* 802.11 auth, could be open, shared, 8021x an= d authswitch */ + u32 dot11_auth_algrthm; /* 802.11 auth, could be open, shared, 8021x a= nd authswitch */ u32 dot11PrivacyAlgrthm; /* This specify the privacy for shared auth. = algorithm. */ =20 /* WEP */ @@ -170,7 +170,7 @@ struct security_priv { =20 #define GET_ENCRY_ALGO(psecuritypriv, psta, encry_algo, bmcst)\ do {\ - switch (psecuritypriv->dot11AuthAlgrthm) {\ + switch (psecuritypriv->dot11_auth_algrthm) {\ case dot11AuthAlgrthm_Open:\ case dot11AuthAlgrthm_Shared:\ case dot11AuthAlgrthm_Auto:\ diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index 1484336d7551..8d6c59b52f6c 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -546,7 +546,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_de= vice *dev, struct ieee_pa if (psecuritypriv->bWepDefaultKeyIdxSet =3D=3D 0) { /* wep default key has not been set, so use this key index as default k= ey. */ =20 - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Auto; + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_Auto; psecuritypriv->ndisencryptstatus =3D Ndis802_11Encryption1Enabled; psecuritypriv->dot11PrivacyAlgrthm =3D _WEP40_; psecuritypriv->dot118021XGrpPrivacy =3D _WEP40_; @@ -616,7 +616,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_de= vice *dev, struct ieee_pa goto exit; } =20 - if (psecuritypriv->dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021X && psta= ) { /* psk/802_1x */ + if (psecuritypriv->dot11_auth_algrthm =3D=3D dot11AuthAlgrthm_8021X && ps= ta) { /* psk/802_1x */ if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) { if (param->u.crypt.set_tx =3D=3D 1) { /* pairwise key */ memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.c= rypt.key_len > 16 ? 16 : param->u.crypt.key_len)); @@ -764,7 +764,7 @@ static int rtw_cfg80211_set_encryption(struct net_devic= e *dev, struct ieee_param goto exit; } =20 - if (padapter->securitypriv.dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021X= ) { /* 802_1x */ + if (padapter->securitypriv.dot11_auth_algrthm =3D=3D dot11AuthAlgrthm_802= 1X) { /* 802_1x */ struct sta_info *psta, *pbcmc_sta; struct sta_priv *pstapriv =3D &padapter->stapriv; =20 @@ -1326,26 +1326,26 @@ static int rtw_cfg80211_set_auth_type(struct securi= ty_priv *psecuritypriv, switch (sme_auth_type) { case NL80211_AUTHTYPE_AUTOMATIC: =20 - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Auto; + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_Auto; =20 break; case NL80211_AUTHTYPE_OPEN_SYSTEM: =20 - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Open; + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_Open; =20 if (psecuritypriv->ndisauthtype > Ndis802_11AuthModeWPA) - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_8021X; =20 break; case NL80211_AUTHTYPE_SHARED_KEY: =20 - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Shared; + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_Shared; =20 psecuritypriv->ndisencryptstatus =3D Ndis802_11Encryption1Enabled; =20 break; default: - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Open; + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_Open; /* return -ENOTSUPP; */ } =20 @@ -1404,9 +1404,9 @@ static int rtw_cfg80211_set_key_mgt(struct security_p= riv *psecuritypriv, u32 key { if (key_mgt =3D=3D WLAN_AKM_SUITE_8021X) /* auth_type =3D UMAC_AUTH_TYPE_8021X; */ - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_8021X; else if (key_mgt =3D=3D WLAN_AKM_SUITE_PSK) { - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_8021X; } =20 return 0; @@ -1447,7 +1447,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *pa= dapter, u8 *pie, size_t iel pwpa =3D 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_ciphe= r, NULL) =3D=3D _SUCCESS) { - padapter->securitypriv.dot11AuthAlgrthm =3D dot11AuthAlgrthm_8021X; + padapter->securitypriv.dot11_auth_algrthm =3D dot11AuthAlgrthm_8021X; padapter->securitypriv.ndisauthtype =3D 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 *pa= dapter, u8 *pie, size_t iel pwpa2 =3D 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_ci= pher, NULL) =3D=3D _SUCCESS) { - padapter->securitypriv.dot11AuthAlgrthm =3D dot11AuthAlgrthm_8021X; + padapter->securitypriv.dot11_auth_algrthm =3D dot11AuthAlgrthm_8021X; padapter->securitypriv.ndisauthtype =3D Ndis802_11AuthModeWPA2PSK; memcpy(padapter->securitypriv.supplicant_ie, &pwpa2[0], wpa2_ielen + 2); } @@ -1579,7 +1579,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy= , struct net_device *ndev, psecuritypriv->ndisencryptstatus =3D Ndis802_11EncryptionDisabled; psecuritypriv->dot11PrivacyAlgrthm =3D _NO_PRIVACY_; psecuritypriv->dot118021XGrpPrivacy =3D _NO_PRIVACY_; - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Open; /* open system= */ + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_Open; /* open syst= em */ psecuritypriv->ndisauthtype =3D Ndis802_11AuthModeOpen; =20 ret =3D rtw_cfg80211_set_auth_type(psecuritypriv, NL80211_AUTHTYPE_OPEN_S= YSTEM); @@ -1675,7 +1675,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, = struct net_device *ndev, psecuritypriv->ndisencryptstatus =3D Ndis802_11EncryptionDisabled; psecuritypriv->dot11PrivacyAlgrthm =3D _NO_PRIVACY_; psecuritypriv->dot118021XGrpPrivacy =3D _NO_PRIVACY_; - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Open; /* open system= */ + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_Open; /* open syst= em */ psecuritypriv->ndisauthtype =3D Ndis802_11AuthModeOpen; =20 ret =3D rtw_cfg80211_set_wpa_version(psecuritypriv, sme->crypto.wpa_versi= ons); @@ -1698,8 +1698,8 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, = struct net_device *ndev, } =20 /* For WEP Shared auth */ - if ((psecuritypriv->dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_Shared || - psecuritypriv->dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_Auto) && sme= ->key) { + if ((psecuritypriv->dot11_auth_algrthm =3D=3D dot11AuthAlgrthm_Shared || + psecuritypriv->dot11_auth_algrthm =3D=3D dot11AuthAlgrthm_Auto) && s= me->key) { u32 wep_key_idx, wep_key_len, wep_total_len; struct ndis_802_11_wep *pwep =3D NULL; =20 diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/= rtl8723bs/os_dep/os_intfs.c index f31196f54b3e..b63db61649af 100644 --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c @@ -534,7 +534,7 @@ static void rtw_init_default_value(struct adapter *pada= pter) psecuritypriv->sw_encrypt =3D pregistrypriv->software_encrypt; psecuritypriv->sw_decrypt =3D pregistrypriv->software_decrypt; =20 - psecuritypriv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Open; /* open system= */ + psecuritypriv->dot11_auth_algrthm =3D dot11AuthAlgrthm_Open; /* open syst= em */ psecuritypriv->dot11PrivacyAlgrthm =3D _NO_PRIVACY_; =20 psecuritypriv->dot11PrivacyKeyIndex =3D 0; --=20 2.54.0