diff options
| author | Hank Yang <s950343@gmail.com> | 2026-09-03 01:39:01 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-09-07 18:21:11 +0200 |
| commit | d03ddece7edef9eebe657a4780441532b5ec8e4b (patch) | |
| tree | 8acc62efa4167b4a2cfcc958db25f098f646b205 | |
| parent | 194ffecc0d6a0f25ac4e2cc612fbad01e09bb351 (diff) | |
| download | linux-next-d03ddece7edef9eebe657a4780441532b5ec8e4b.tar.gz linux-next-d03ddece7edef9eebe657a4780441532b5ec8e4b.zip | |
staging: rtl8723bs: rename CamelCase variables in rtw_mlme.c
Rename several CamelCase variables to snake_case to comply with
kernel coding style, as flagged by checkpatch.pl:
CHECK: Avoid CamelCase: <iEntry>
CHECK: Avoid CamelCase: <backupPMKIDList>
CHECK: Avoid CamelCase: <backupPMKIDIndex>
CHECK: Avoid CamelCase: <backupTKIPCountermeasure>
CHECK: Avoid CamelCase: <backupTKIPcountermeasure_time>
Signed-off-by: Hank Yang <s950343@gmail.com>
Link: https://patch.msgid.link/20260902173901.50435-1-s950343@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_mlme.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 13409becd264..e22e33c364bb 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1080,12 +1080,12 @@ static void rtw_joinbss_update_network(struct adapter *adapter, struct wlan_netw rtw_update_ht_cap(adapter, cur_network->network.ies, cur_network->network.ie_length, (u8) cur_network->network.configuration.ds_config); } -static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE]; +static struct rt_pmkid_list backup_pmkid_list[NUM_PMKID_CACHE]; void rtw_reset_securitypriv(struct adapter *adapter) { - u8 backupPMKIDIndex = 0; - u8 backupTKIPCountermeasure = 0x00; - u32 backupTKIPcountermeasure_time = 0; + u8 backup_pmkid_index = 0; + u8 backup_tkip_countermeasure = 0x00; + u32 backup_tkip_countermeasure_time = 0; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; spin_lock_bh(&adapter->security_key_mutex); @@ -1098,10 +1098,10 @@ void rtw_reset_securitypriv(struct adapter *adapter) /* Backup the btkip_countermeasure information. */ /* When the countermeasure is trigger, the driver have to disconnect with AP for 60 seconds. */ - memcpy(&backupPMKIDList[0], &adapter->securitypriv.PMKIDList[0], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); - backupPMKIDIndex = adapter->securitypriv.PMKIDIndex; - backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure; - backupTKIPcountermeasure_time = adapter->securitypriv.btkip_countermeasure_time; + memcpy(&backup_pmkid_list[0], &adapter->securitypriv.PMKIDList[0], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); + backup_pmkid_index = adapter->securitypriv.PMKIDIndex; + backup_tkip_countermeasure = adapter->securitypriv.btkip_countermeasure; + backup_tkip_countermeasure_time = adapter->securitypriv.btkip_countermeasure_time; /* reset RX BIP packet number */ pmlmeext->mgnt_80211w_IPN_rx = 0; @@ -1110,10 +1110,10 @@ void rtw_reset_securitypriv(struct adapter *adapter) /* Added by Albert 2009/02/18 */ /* Restore the PMK information to securitypriv structure for the following connection. */ - memcpy(&adapter->securitypriv.PMKIDList[0], &backupPMKIDList[0], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); - adapter->securitypriv.PMKIDIndex = backupPMKIDIndex; - adapter->securitypriv.btkip_countermeasure = backupTKIPCountermeasure; - adapter->securitypriv.btkip_countermeasure_time = backupTKIPcountermeasure_time; + memcpy(&adapter->securitypriv.PMKIDList[0], &backup_pmkid_list[0], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); + adapter->securitypriv.PMKIDIndex = backup_pmkid_index; + adapter->securitypriv.btkip_countermeasure = backup_tkip_countermeasure; + adapter->securitypriv.btkip_countermeasure_time = backup_tkip_countermeasure_time; adapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; @@ -2016,7 +2016,7 @@ static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid) /* 13th element in the array is the IE length */ /* */ -static int rtw_append_pmkid(struct adapter *Adapter, int iEntry, u8 *ie, uint ie_len) +static int rtw_append_pmkid(struct adapter *Adapter, int pmkid_idx, u8 *ie, uint ie_len) { struct security_priv *psecuritypriv = &Adapter->securitypriv; @@ -2026,7 +2026,7 @@ static int rtw_append_pmkid(struct adapter *Adapter, int iEntry, u8 *ie, uint ie ie_len++; ie[ie_len] = 0; /* PMKID count = 0x0100 */ ie_len++; - memcpy(&ie[ie_len], &psecuritypriv->PMKIDList[iEntry].PMKID, 16); + memcpy(&ie[ie_len], &psecuritypriv->PMKIDList[pmkid_idx].PMKID, 16); ie_len += 16; ie[13] += 18;/* PMKID length = 2+16 */ } @@ -2070,7 +2070,7 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u { u8 authmode = 0x0; uint ielength; - int iEntry; + int pmkid_idx; struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct security_priv *psecuritypriv = &adapter->securitypriv; @@ -2095,12 +2095,12 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie); } - iEntry = SecIsInPMKIDList(adapter, mlme_priv->assoc_bssid); - if (iEntry < 0) + pmkid_idx = SecIsInPMKIDList(adapter, mlme_priv->assoc_bssid); + if (pmkid_idx < 0) return ielength; if (authmode == WLAN_EID_RSN) - ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength); + ielength = rtw_append_pmkid(adapter, pmkid_idx, out_ie, ielength); return ielength; } |
