From 9d8d6a3ac7d8ec8c4fb1fca0f22ef8016b0efd6b Mon Sep 17 00:00:00 2001 From: Gabriel Changamire Date: Tue, 28 Jul 2026 22:39:06 +0000 Subject: staging: sm750fb: fix kernel-doc comments in sm750_accel.h Fix the function name typo in the kernel-doc comment for sm750_hw_copyarea() (sm750_hm_copyarea) and add the missing @accel parameter descriptions for sm750_hw_copyarea() and sm750_hw_imageblit(), using the same wording as the corresponding comments in sm750_accel.c. This silences the kernel-doc warnings about the mismatched function name and the undescribed accel parameters. No functional change. Signed-off-by: Gabriel Changamire Link: https://patch.msgid.link/20260728223906.350-1-gaberashawn@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sm750fb/sm750_accel.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/sm750fb/sm750_accel.h b/drivers/staging/sm750fb/sm750_accel.h index 617885431661..e76928bf260f 100644 --- a/drivers/staging/sm750fb/sm750_accel.h +++ b/drivers/staging/sm750fb/sm750_accel.h @@ -195,7 +195,8 @@ int sm750_hw_fillrect(struct lynx_accel *accel, u32 color, u32 rop); /** - * sm750_hm_copyarea + * sm750_hw_copyarea + * @accel: Acceleration device data * @source_base: Address of source: offset in frame buffer * @source_pitch: Pitch value of source surface in BYTE * @sx: Starting x coordinate of source surface @@ -219,6 +220,7 @@ int sm750_hw_copyarea(struct lynx_accel *accel, /** * sm750_hw_imageblit + * @accel: Acceleration device data * @src_buf: pointer to start of source buffer in system memory * @src_delta: Pitch value (in bytes) of the source buffer, +ive means top down *>----- and -ive mean button up -- cgit v1.2.3 From 50e29941dcced12bd4c832eb27e1e5cfec88fb6a Mon Sep 17 00:00:00 2001 From: Maxim Codita Date: Wed, 12 Aug 2026 13:44:21 +0200 Subject: staging: sm750fb/sm750.c: mark g_def_fbmode as const pointer Fix a checkpatch.pl warning for g_def_fbmode by marking the pointer as const. Ensures it is stored as read-only. Note: g_fbmode[] is left as non-const as its elements are modified at runtime by lynxfb_set_fbinfo() and sm750fb_setup(). Signed-off-by: Maxim Codita Link: https://patch.msgid.link/20260812114421.24860-1-maxkoditsa7c@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sm750fb/sm750.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index 039e2033f84e..f842dfaf5769 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -13,7 +13,7 @@ static int g_hwcursor = 1; static int g_noaccel __ro_after_init; static int g_nomtrr __ro_after_init; static const char *g_fbmode[] = {NULL, NULL}; -static const char *g_def_fbmode = "1024x768-32@60"; +static const char * const g_def_fbmode = "1024x768-32@60"; static char *g_settings; static int g_dualview __ro_after_init; static char *g_option; -- cgit v1.2.3 From ac16d60fa171b583e5ab27fc95f43152c1cd798e Mon Sep 17 00:00:00 2001 From: Triet Hoang Date: Sat, 22 Aug 2026 08:34:08 +0000 Subject: staging: sm750: Convert to DEFINE_SIMPLE_DEV_PM_OPS() Convert the deprecated SIMPLE_DEV_PM_OPS to DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr(). This lets us drop the __maybe_unused annotations from the suspend and resume callbacks, also reduces kernel size in case CONFIG_PM or CONFIG_PM_SLEEP is disabled. Signed-off-by: Triet Hoang Link: https://patch.msgid.link/20260822083408.44764-1-triet.hoang.dev@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sm750fb/sm750.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index f842dfaf5769..4725fc423f1b 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -384,7 +384,7 @@ static inline unsigned int chan_to_field(unsigned int chan, return chan << bf->offset; } -static int __maybe_unused lynxfb_suspend(struct device *dev) +static int lynxfb_suspend(struct device *dev) { struct fb_info *info; struct sm750_dev *sm750_dev; @@ -405,7 +405,7 @@ static int __maybe_unused lynxfb_suspend(struct device *dev) return 0; } -static int __maybe_unused lynxfb_resume(struct device *dev) +static int lynxfb_resume(struct device *dev) { struct pci_dev *pdev = to_pci_dev(dev); struct fb_info *info; @@ -1094,14 +1094,14 @@ static const struct pci_device_id smi_pci_table[] = { MODULE_DEVICE_TABLE(pci, smi_pci_table); -static SIMPLE_DEV_PM_OPS(lynxfb_pm_ops, lynxfb_suspend, lynxfb_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(lynxfb_pm_ops, lynxfb_suspend, lynxfb_resume); static struct pci_driver lynxfb_driver = { .name = "sm750fb", .id_table = smi_pci_table, .probe = lynxfb_pci_probe, .remove = lynxfb_pci_remove, - .driver.pm = &lynxfb_pm_ops, + .driver.pm = pm_sleep_ptr(&lynxfb_pm_ops), }; static int __init lynxfb_init(void) -- cgit v1.2.3 From e8716b60532661709cc97db0518257bceb11ae94 Mon Sep 17 00:00:00 2001 From: Tomasz Unger Date: Sat, 22 Aug 2026 15:46:51 +0200 Subject: staging: sm750fb: fix typo in comment Fix a typo in a comment: "defaulty" should be "default". Signed-off-by: Tomasz Unger Link: https://patch.msgid.link/20260822-sm750fb-defaulty-typo-fix-v1-1-d2f668b1ccca@yahoo.pl Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sm750fb/sm750.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index 4725fc423f1b..dd3f31ee13b7 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -479,7 +479,7 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var, /* check if current fb's video memory big enough to hold the onscreen*/ request = var->xres_virtual * (var->bits_per_pixel >> 3); - /* defaulty crtc->channel go with par->index */ + /* default crtc->channel go with par->index */ request = ALIGN(request, crtc->line_pad); request = request * var->yres_virtual; -- cgit v1.2.3 From 2a371584385b97cb9772f76a3b18c663911b93b5 Mon Sep 17 00:00:00 2001 From: Olivier Tanoh Date: Tue, 28 Jul 2026 14:36:31 +0200 Subject: staging: rtl8723bs: rename mBratesOS to avoid CamelCase Fix checkpatch.pl warning regarding the use of CamelCase: CHECK: Avoid CamelCase: Rename it to basic_rates, which describes the content of the variable, rather than keeping the Hungarian notation prefixes. Signed-off-by: Olivier Tanoh Link: https://patch.msgid.link/20260728123633.79735-2-olivier.tanoh19@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 6 +++--- drivers/staging/rtl8723bs/hal/hal_com.c | 6 +++--- drivers/staging/rtl8723bs/include/hal_com.h | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c index 8c1f4670679b..6d49dff616c2 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -180,14 +180,14 @@ void set_mcs_rate_by_mask(u8 *mcs_set, u32 mask) mcs_set[3] &= mcs_rate_4r; } -void update_basic_rate_table(struct adapter *Adapter, u8 *mBratesOS) +void update_basic_rate_table(struct adapter *Adapter, u8 *basic_rates) { u8 i; u8 rate; /* 1M, 2M, 5.5M, 11M, 6M, 12M, 24M are mandatory. */ for (i = 0; i < NDIS_802_11_LENGTH_RATES_EX; i++) { - rate = mBratesOS[i] & 0x7f; + rate = basic_rates[i] & 0x7f; switch (rate) { case IEEE80211_CCK_RATE_1MB: case IEEE80211_CCK_RATE_2MB: @@ -196,7 +196,7 @@ void update_basic_rate_table(struct adapter *Adapter, u8 *mBratesOS) case IEEE80211_OFDM_RATE_6MB: case IEEE80211_OFDM_RATE_12MB: case IEEE80211_OFDM_RATE_24MB: - mBratesOS[i] |= IEEE80211_BASIC_RATE_MASK; + basic_rates[i] |= IEEE80211_BASIC_RATE_MASK; break; } } diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c index 2c856a2721b2..656c75ded16f 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com.c +++ b/drivers/staging/rtl8723bs/hal/hal_com.c @@ -247,13 +247,13 @@ u8 HwRateToMRate(u8 rate) return ret_rate; } -void HalSetBrateCfg(struct adapter *Adapter, u8 *mBratesOS, u16 *pBrateCfg) +void HalSetBrateCfg(struct adapter *Adapter, u8 *basic_rates, u16 *pBrateCfg) { u8 i, is_brate, brate; for (i = 0; i < NDIS_802_11_LENGTH_RATES_EX; i++) { - is_brate = mBratesOS[i] & IEEE80211_BASIC_RATE_MASK; - brate = mBratesOS[i] & 0x7f; + is_brate = basic_rates[i] & IEEE80211_BASIC_RATE_MASK; + brate = basic_rates[i] & 0x7f; if (is_brate) { switch (brate) { diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/rtl8723bs/include/hal_com.h index 7bbf62cfd825..17bce0f88bac 100644 --- a/drivers/staging/rtl8723bs/include/hal_com.h +++ b/drivers/staging/rtl8723bs/include/hal_com.h @@ -112,7 +112,7 @@ u8 HwRateToMRate(u8 rate); void HalSetBrateCfg( struct adapter *Adapter, - u8 *mBratesOS, + u8 *basic_rates, u16 *pBrateCfg); bool diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h index 179fae4d8fcc..4b79e56f329a 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -430,7 +430,7 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta); void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssrate_len); void set_mcs_rate_by_mask(u8 *mcs_set, u32 mask); -void update_basic_rate_table(struct adapter *padapter, u8 *mBratesOS); +void update_basic_rate_table(struct adapter *padapter, u8 *basic_rates); void update_basic_rate_table_soft_ap(u8 *bssrateset, u32 bssratelen); void save_dm_func_flag(struct adapter *padapter); -- cgit v1.2.3 From c726f140863753d1a3e6cf5c618100780f4af7f5 Mon Sep 17 00:00:00 2001 From: Dalvin-Ehinoma Noah Aiguobas Date: Fri, 31 Jul 2026 10:41:24 +0000 Subject: staging: rtl8723bs: renaming variable pbuf in rtw_mlme.c Renaming occurrences of pbuf to buf since the prefix p is an old naming convention to indicate a pointer variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas Link: https://patch.msgid.link/20260731104134.12754-2-fliegbert2@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index fc46b33b836a..7f43f8f27186 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -42,7 +42,7 @@ static void rtw_init_mlme_timer(struct adapter *padapter) int rtw_init_mlme_priv(struct adapter *padapter) { int i; - u8 *pbuf; + u8 *buf; struct wlan_network *pnetwork; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; int res = _SUCCESS; @@ -62,15 +62,15 @@ int rtw_init_mlme_priv(struct adapter *padapter) memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid)); - pbuf = vzalloc(array_size(MAX_BSS_CNT, sizeof(struct wlan_network))); + buf = vzalloc(array_size(MAX_BSS_CNT, sizeof(struct wlan_network))); - if (!pbuf) { + if (!buf) { res = _FAIL; goto exit; } - pmlmepriv->free_bss_buf = pbuf; + pmlmepriv->free_bss_buf = buf; - pnetwork = (struct wlan_network *)pbuf; + pnetwork = (struct wlan_network *)buf; for (i = 0; i < MAX_BSS_CNT; i++) { INIT_LIST_HEAD(&pnetwork->list); @@ -632,13 +632,13 @@ static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network return bselected; } -void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_survey_event_callback(struct adapter *adapter, u8 *buf) { u32 len; struct wlan_bssid_ex *pnetwork; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; - pnetwork = (struct wlan_bssid_ex *)pbuf; + pnetwork = (struct wlan_bssid_ex *)buf; len = get_wlan_bssid_ex_sz(pnetwork); if (len > (sizeof(struct wlan_bssid_ex))) @@ -675,7 +675,7 @@ exit: spin_unlock_bh(&pmlmepriv->lock); } -void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_surveydone_event_callback(struct adapter *adapter, u8 *buf) { struct mlme_priv *pmlmepriv = &adapter->mlmepriv; @@ -777,11 +777,11 @@ unlock: rtw_indicate_scan_done(adapter, false); } -void rtw_dummy_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_dummy_event_callback(struct adapter *adapter, u8 *buf) { } -void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *buf) { } @@ -1143,12 +1143,12 @@ void rtw_reset_securitypriv(struct adapter *adapter) /* if join_res > 0, for (fw_state ==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist. */ /* if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan != NULL). */ /* */ -void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) +void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *buf) { struct sta_info *ptarget_sta = NULL, *pcur_sta = NULL; struct sta_priv *pstapriv = &adapter->stapriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; - struct wlan_network *pnetwork = (struct wlan_network *)pbuf; + struct wlan_network *pnetwork = (struct wlan_network *)buf; struct wlan_network *cur_network = &pmlmepriv->cur_network; struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL; unsigned int the_same_macaddr = false; @@ -1251,9 +1251,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) timer_delete_sync(&pmlmepriv->assoc_timer); } -void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_joinbss_event_callback(struct adapter *adapter, u8 *buf) { - struct wlan_network *pnetwork = (struct wlan_network *)pbuf; + struct wlan_network *pnetwork = (struct wlan_network *)buf; mlmeext_joinbss_event_callback(adapter, pnetwork->join_res); @@ -1272,11 +1272,11 @@ void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *psta, u3 rtw_hal_set_hwreg(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_status_rpt); } -void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_stassoc_event_callback(struct adapter *adapter, u8 *buf) { struct sta_info *psta; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; - struct stassoc_event *pstassoc = (struct stassoc_event *)pbuf; + struct stassoc_event *pstassoc = (struct stassoc_event *)buf; struct wlan_network *cur_network = &pmlmepriv->cur_network; struct wlan_network *ptarget_wlan = NULL; @@ -1363,7 +1363,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) mlmeext_sta_add_event_callback(adapter, psta); } -void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) +void rtw_stadel_event_callback(struct adapter *adapter, u8 *buf) { int mac_id = (-1); struct sta_info *psta; @@ -1371,7 +1371,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) struct wlan_bssid_ex *pdev_network = NULL; u8 *pibss = NULL; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; - struct stadel_event *pstadel = (struct stadel_event *)pbuf; + struct stadel_event *pstadel = (struct stadel_event *)buf; struct wlan_network *tgt_network = &pmlmepriv->cur_network; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; @@ -1480,16 +1480,16 @@ unlock: spin_unlock_bh(&pmlmepriv->lock); } -void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf) +void rtw_cpwm_event_callback(struct adapter *padapter, u8 *buf) { struct reportpwrstate_parm *preportpwrstate; - preportpwrstate = (struct reportpwrstate_parm *)pbuf; + preportpwrstate = (struct reportpwrstate_parm *)buf; preportpwrstate->state |= (u8)(adapter_to_pwrctl(padapter)->cpwm_tog + 0x80); cpwm_int_hdl(padapter, preportpwrstate); } -void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf) +void rtw_wmm_event_callback(struct adapter *padapter, u8 *buf) { WMMOnAssocRsp(padapter); } -- cgit v1.2.3 From f3c7db00414a569d55bec763e699f229015d46bf Mon Sep 17 00:00:00 2001 From: Dalvin-Ehinoma Noah Aiguobas Date: Fri, 31 Jul 2026 10:41:25 +0000 Subject: staging: rtl8723bs: renaming variable pmlmepriv in rtw_mlme.c Renaming occurrences of pmlmepriv to mlme_priv since the prefix p is an old naming convention to indicate a pointer variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas Link: https://patch.msgid.link/20260731104134.12754-3-fliegbert2@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 520 +++++++++++++++--------------- 1 file changed, 260 insertions(+), 260 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 7f43f8f27186..276bf83fa024 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -29,13 +29,13 @@ static void _rtw_set_scan_deny_timer_hdl(struct timer_list *t) static void rtw_init_mlme_timer(struct adapter *padapter) { - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; - timer_setup(&pmlmepriv->assoc_timer, _rtw_join_timeout_handler, 0); - timer_setup(&pmlmepriv->scan_to_timer, rtw_scan_timeout_handler, 0); - timer_setup(&pmlmepriv->dynamic_chk_timer, + timer_setup(&mlme_priv->assoc_timer, _rtw_join_timeout_handler, 0); + timer_setup(&mlme_priv->scan_to_timer, rtw_scan_timeout_handler, 0); + timer_setup(&mlme_priv->dynamic_chk_timer, _dynamic_check_timer_handler, 0); - timer_setup(&pmlmepriv->set_scan_deny_timer, + timer_setup(&mlme_priv->set_scan_deny_timer, _rtw_set_scan_deny_timer_hdl, 0); } @@ -44,23 +44,23 @@ int rtw_init_mlme_priv(struct adapter *padapter) int i; u8 *buf; struct wlan_network *pnetwork; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; int res = _SUCCESS; - pmlmepriv->nic_hdl = (u8 *)padapter; + mlme_priv->nic_hdl = (u8 *)padapter; - pmlmepriv->pscanned = NULL; - pmlmepriv->fw_state = WIFI_STATION_STATE; /* Must sync with rtw_wdev_alloc() */ - pmlmepriv->cur_network.network.infrastructure_mode = NL80211_IFTYPE_UNSPECIFIED; - pmlmepriv->scan_mode = SCAN_ACTIVE;/* 1: active, 0: passive. Maybe someday we should rename this variable to "active_mode" (Jeff) */ + mlme_priv->pscanned = NULL; + mlme_priv->fw_state = WIFI_STATION_STATE; /* Must sync with rtw_wdev_alloc() */ + mlme_priv->cur_network.network.infrastructure_mode = NL80211_IFTYPE_UNSPECIFIED; + mlme_priv->scan_mode = SCAN_ACTIVE;/* 1: active, 0: passive. Maybe someday we should rename this variable to "active_mode" (Jeff) */ - spin_lock_init(&pmlmepriv->lock); - INIT_LIST_HEAD(&pmlmepriv->free_bss_pool.queue); - spin_lock_init(&pmlmepriv->free_bss_pool.lock); - INIT_LIST_HEAD(&pmlmepriv->scanned_queue.queue); - spin_lock_init(&pmlmepriv->scanned_queue.lock); + spin_lock_init(&mlme_priv->lock); + INIT_LIST_HEAD(&mlme_priv->free_bss_pool.queue); + spin_lock_init(&mlme_priv->free_bss_pool.lock); + INIT_LIST_HEAD(&mlme_priv->scanned_queue.queue); + spin_lock_init(&mlme_priv->scanned_queue.lock); - memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid)); + memset(&mlme_priv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid)); buf = vzalloc(array_size(MAX_BSS_CNT, sizeof(struct wlan_network))); @@ -68,14 +68,14 @@ int rtw_init_mlme_priv(struct adapter *padapter) res = _FAIL; goto exit; } - pmlmepriv->free_bss_buf = buf; + mlme_priv->free_bss_buf = buf; pnetwork = (struct wlan_network *)buf; for (i = 0; i < MAX_BSS_CNT; i++) { INIT_LIST_HEAD(&pnetwork->list); - list_add_tail(&pnetwork->list, &pmlmepriv->free_bss_pool.queue); + list_add_tail(&pnetwork->list, &mlme_priv->free_bss_pool.queue); pnetwork++; } @@ -88,14 +88,14 @@ int rtw_init_mlme_priv(struct adapter *padapter) #define RTW_ROAM_RSSI_DIFF_TH 10 #define RTW_ROAM_SCAN_INTERVAL_MS 10000 - pmlmepriv->roam_flags = 0 + mlme_priv->roam_flags = 0 | RTW_ROAM_ON_EXPIRED | RTW_ROAM_ON_RESUME ; - pmlmepriv->roam_scanr_exp_ms = RTW_ROAM_SCAN_RESULT_EXP_MS; - pmlmepriv->roam_rssi_diff_th = RTW_ROAM_RSSI_DIFF_TH; - pmlmepriv->roam_scan_int_ms = RTW_ROAM_SCAN_INTERVAL_MS; + mlme_priv->roam_scanr_exp_ms = RTW_ROAM_SCAN_RESULT_EXP_MS; + mlme_priv->roam_rssi_diff_th = RTW_ROAM_RSSI_DIFF_TH; + mlme_priv->roam_scan_int_ms = RTW_ROAM_SCAN_INTERVAL_MS; rtw_init_mlme_timer(padapter); @@ -113,34 +113,34 @@ static void rtw_free_mlme_ie_data(u8 **ppie, u32 *plen) } } -void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv) +void rtw_free_mlme_priv_ie_data(struct mlme_priv *mlme_priv) { - rtw_buf_free(&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len); - rtw_buf_free(&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len); - rtw_free_mlme_ie_data(&pmlmepriv->wps_beacon_ie, &pmlmepriv->wps_beacon_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->wps_probe_req_ie, &pmlmepriv->wps_probe_req_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->wps_probe_resp_ie, &pmlmepriv->wps_probe_resp_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->wps_assoc_resp_ie, &pmlmepriv->wps_assoc_resp_ie_len); + rtw_buf_free(&mlme_priv->assoc_req, &mlme_priv->assoc_req_len); + rtw_buf_free(&mlme_priv->assoc_rsp, &mlme_priv->assoc_rsp_len); + rtw_free_mlme_ie_data(&mlme_priv->wps_beacon_ie, &mlme_priv->wps_beacon_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->wps_probe_req_ie, &mlme_priv->wps_probe_req_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->wps_probe_resp_ie, &mlme_priv->wps_probe_resp_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->wps_assoc_resp_ie, &mlme_priv->wps_assoc_resp_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->p2p_beacon_ie, &pmlmepriv->p2p_beacon_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_req_ie, &pmlmepriv->p2p_probe_req_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_resp_ie, &pmlmepriv->p2p_probe_resp_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->p2p_go_probe_resp_ie, &pmlmepriv->p2p_go_probe_resp_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc_req_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->p2p_beacon_ie, &mlme_priv->p2p_beacon_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->p2p_probe_req_ie, &mlme_priv->p2p_probe_req_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->p2p_probe_resp_ie, &mlme_priv->p2p_probe_resp_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->p2p_go_probe_resp_ie, &mlme_priv->p2p_go_probe_resp_ie_len); + rtw_free_mlme_ie_data(&mlme_priv->p2p_assoc_req_ie, &mlme_priv->p2p_assoc_req_ie_len); } -void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) +void _rtw_free_mlme_priv(struct mlme_priv *mlme_priv) { - if (pmlmepriv) { - rtw_free_mlme_priv_ie_data(pmlmepriv); - vfree(pmlmepriv->free_bss_buf); + if (mlme_priv) { + rtw_free_mlme_priv_ie_data(mlme_priv); + vfree(mlme_priv->free_bss_buf); } } -struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) +struct wlan_network *rtw_alloc_network(struct mlme_priv *mlme_priv) { struct wlan_network *pnetwork; - struct __queue *free_queue = &pmlmepriv->free_bss_pool; + struct __queue *free_queue = &mlme_priv->free_bss_pool; struct list_head *plist = NULL; spin_lock_bh(&free_queue->lock); @@ -167,11 +167,11 @@ exit: return pnetwork; } -void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall) +void _rtw_free_network(struct mlme_priv *mlme_priv, struct wlan_network *pnetwork, u8 isfreeall) { unsigned int delta_time; u32 lifetime = SCANQUEUE_LIFETIME; - struct __queue *free_queue = &pmlmepriv->free_bss_pool; + struct __queue *free_queue = &mlme_priv->free_bss_pool; if (!pnetwork) return; @@ -179,8 +179,8 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwor if (pnetwork->fixed) return; - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) || - check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) + if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE) || + check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) lifetime = 1; if (!isfreeall) { @@ -198,9 +198,9 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwor spin_unlock_bh(&free_queue->lock); } -void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork) +void _rtw_free_network_nolock(struct mlme_priv *mlme_priv, struct wlan_network *pnetwork) { - struct __queue *free_queue = &pmlmepriv->free_bss_pool; + struct __queue *free_queue = &mlme_priv->free_bss_pool; if (!pnetwork) return; @@ -247,8 +247,8 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall) { struct list_head *phead, *plist, *tmp; struct wlan_network *pnetwork; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct __queue *scanned_queue = &pmlmepriv->scanned_queue; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct __queue *scanned_queue = &mlme_priv->scanned_queue; spin_lock_bh(&scanned_queue->lock); @@ -256,7 +256,7 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall) list_for_each_safe(plist, tmp, phead) { pnetwork = list_entry(plist, struct wlan_network, list); - _rtw_free_network(pmlmepriv, pnetwork, isfreeall); + _rtw_free_network(mlme_priv, pnetwork, isfreeall); } spin_unlock_bh(&scanned_queue->lock); @@ -302,9 +302,9 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie) return ie + 8; } -void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) +void rtw_free_mlme_priv(struct mlme_priv *mlme_priv) { - _rtw_free_mlme_priv(pmlmepriv); + _rtw_free_mlme_priv(mlme_priv); } void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork); @@ -452,25 +452,25 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork) { - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; - if (check_fwstate(pmlmepriv, _FW_LINKED) && (is_same_network(&pmlmepriv->cur_network.network, pnetwork, 0))) { - update_network(&pmlmepriv->cur_network.network, pnetwork, adapter, true); - if (pmlmepriv->cur_network.network.ie_length < sizeof(struct ndis_802_11_fix_ie)) + if (check_fwstate(mlme_priv, _FW_LINKED) && (is_same_network(&mlme_priv->cur_network.network, pnetwork, 0))) { + update_network(&mlme_priv->cur_network.network, pnetwork, adapter, true); + if (mlme_priv->cur_network.network.ie_length < sizeof(struct ndis_802_11_fix_ie)) return; - rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + sizeof(struct ndis_802_11_fix_ie), - pmlmepriv->cur_network.network.ie_length - sizeof(struct ndis_802_11_fix_ie)); + rtw_update_protection(adapter, (mlme_priv->cur_network.network.ies) + sizeof(struct ndis_802_11_fix_ie), + mlme_priv->cur_network.network.ie_length - sizeof(struct ndis_802_11_fix_ie)); } } -/* Caller must hold pmlmepriv->lock first. */ +/* Caller must hold mlme_priv->lock first. */ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target) { struct list_head *plist, *phead; u32 bssid_ex_sz; - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; - struct __queue *queue = &pmlmepriv->scanned_queue; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; + struct __queue *queue = &mlme_priv->scanned_queue; struct wlan_network *pnetwork = NULL; struct wlan_network *oldest = NULL; int target_find = 0; @@ -499,7 +499,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t * with this beacon's information */ if (!target_find) { - if (list_empty(&pmlmepriv->free_bss_pool.queue)) { + if (list_empty(&mlme_priv->free_bss_pool.queue)) { /* If there are no more slots, expire the oldest */ /* list_del_init(&oldest->list); */ pnetwork = oldest; @@ -521,7 +521,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t } else { /* Otherwise just pull from the free list */ - pnetwork = rtw_alloc_network(pmlmepriv); /* will update scan_time */ + pnetwork = rtw_alloc_network(mlme_priv); /* will update scan_time */ if (!pnetwork) goto exit; @@ -583,7 +583,7 @@ static void rtw_add_network(struct adapter *adapter, struct wlan_bssid_ex *pnetw static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork) { struct security_priv *psecuritypriv = &adapter->securitypriv; - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; u32 desired_encmode; u32 privacy; uint wps_ielen; @@ -592,7 +592,7 @@ static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network desired_encmode = psecuritypriv->ndisencryptstatus; privacy = pnetwork->network.privacy; - if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) { + if (check_fwstate(mlme_priv, WIFI_UNDER_WPS)) { if (pnetwork->network.ie_length < _FIXED_IE_LENGTH_) return false; if (rtw_get_wps_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, pnetwork->network.ie_length - _FIXED_IE_LENGTH_, NULL, &wps_ielen)) @@ -624,8 +624,8 @@ static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) bselected = false; - if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { - if (pnetwork->network.infrastructure_mode != pmlmepriv->cur_network.network.infrastructure_mode) + if (check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) { + if (pnetwork->network.infrastructure_mode != mlme_priv->cur_network.network.infrastructure_mode) bselected = false; } @@ -636,7 +636,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *buf) { u32 len; struct wlan_bssid_ex *pnetwork; - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; pnetwork = (struct wlan_bssid_ex *)buf; @@ -644,27 +644,27 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *buf) if (len > (sizeof(struct wlan_bssid_ex))) return; - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); /* update IBSS_network 's timestamp */ - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) { - if (!memcmp(&pmlmepriv->cur_network.network.mac_address, pnetwork->mac_address, ETH_ALEN)) { + if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE)) { + if (!memcmp(&mlme_priv->cur_network.network.mac_address, pnetwork->mac_address, ETH_ALEN)) { struct wlan_network *ibss_wlan = NULL; - memcpy(pmlmepriv->cur_network.network.ies, pnetwork->ies, 8); - spin_lock_bh(&pmlmepriv->scanned_queue.lock); - ibss_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->mac_address); + memcpy(mlme_priv->cur_network.network.ies, pnetwork->ies, 8); + spin_lock_bh(&mlme_priv->scanned_queue.lock); + ibss_wlan = rtw_find_network(&mlme_priv->scanned_queue, pnetwork->mac_address); if (ibss_wlan) { memcpy(ibss_wlan->network.ies, pnetwork->ies, 8); - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); goto exit; } - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); } } - /* lock pmlmepriv->lock when you accessing network_q */ - if (!check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) { + /* lock mlme_priv->lock when you accessing network_q */ + if (!check_fwstate(mlme_priv, _FW_UNDER_LINKING)) { if (pnetwork->ssid.ssid[0] == 0) pnetwork->ssid.ssid_length = 0; rtw_add_network(adapter, pnetwork); @@ -672,36 +672,36 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *buf) exit: - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); } void rtw_surveydone_event_callback(struct adapter *adapter, u8 *buf) { - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; - spin_lock_bh(&pmlmepriv->lock); - if (pmlmepriv->wps_probe_req_ie) { - pmlmepriv->wps_probe_req_ie_len = 0; - kfree(pmlmepriv->wps_probe_req_ie); - pmlmepriv->wps_probe_req_ie = NULL; + spin_lock_bh(&mlme_priv->lock); + if (mlme_priv->wps_probe_req_ie) { + mlme_priv->wps_probe_req_ie_len = 0; + kfree(mlme_priv->wps_probe_req_ie); + mlme_priv->wps_probe_req_ie = NULL; } - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) { - spin_unlock_bh(&pmlmepriv->lock); - timer_delete_sync(&pmlmepriv->scan_to_timer); - spin_lock_bh(&pmlmepriv->lock); - _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); + if (check_fwstate(mlme_priv, _FW_UNDER_SURVEY)) { + spin_unlock_bh(&mlme_priv->lock); + timer_delete_sync(&mlme_priv->scan_to_timer); + spin_lock_bh(&mlme_priv->lock); + _clr_fwstate_(mlme_priv, _FW_UNDER_SURVEY); } rtw_set_signal_stat_timer(&adapter->recvpriv); - if (pmlmepriv->to_join) { - if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { - if (!check_fwstate(pmlmepriv, _FW_LINKED)) { - set_fwstate(pmlmepriv, _FW_UNDER_LINKING); + if (mlme_priv->to_join) { + if (check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) { + if (!check_fwstate(mlme_priv, _FW_LINKED)) { + set_fwstate(mlme_priv, _FW_UNDER_LINKING); - if (rtw_select_and_join_from_scanned_queue(pmlmepriv) == _SUCCESS) { - _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); + if (rtw_select_and_join_from_scanned_queue(mlme_priv) == _SUCCESS) { + _set_timer(&mlme_priv->assoc_timer, MAX_JOIN_TIMEOUT); } else { u8 ret = _SUCCESS; struct wlan_bssid_ex *pdev_network = @@ -709,18 +709,18 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *buf) u8 *pibss = adapter->registrypriv.dev_network.mac_address; - /* pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;because don't set assoc_timer */ - _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); + /* mlme_priv->fw_state ^= _FW_UNDER_SURVEY;because don't set assoc_timer */ + _clr_fwstate_(mlme_priv, _FW_UNDER_SURVEY); - memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, + memcpy(&pdev_network->ssid, &mlme_priv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); rtw_update_registrypriv_dev_network(adapter); rtw_generate_random_ibss(pibss); - pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE; + mlme_priv->fw_state = WIFI_ADHOC_MASTER_STATE; - pmlmepriv->to_join = false; + mlme_priv->to_join = false; ret = rtw_createbss_cmd(adapter); if (ret != _SUCCESS) @@ -730,37 +730,37 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *buf) } else { int s_ret; - set_fwstate(pmlmepriv, _FW_UNDER_LINKING); - pmlmepriv->to_join = false; - s_ret = rtw_select_and_join_from_scanned_queue(pmlmepriv); + set_fwstate(mlme_priv, _FW_UNDER_LINKING); + mlme_priv->to_join = false; + s_ret = rtw_select_and_join_from_scanned_queue(mlme_priv); if (s_ret == _SUCCESS) { - _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); + _set_timer(&mlme_priv->assoc_timer, MAX_JOIN_TIMEOUT); } else if (s_ret == 2) {/* there is no need to wait for join */ - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); + _clr_fwstate_(mlme_priv, _FW_UNDER_LINKING); rtw_indicate_connect(adapter); } else { if (rtw_to_roam(adapter) != 0) { if (rtw_dec_to_roam(adapter) == 0 || - rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid, + rtw_sitesurvey_cmd(adapter, &mlme_priv->assoc_ssid, 1, NULL, 0) != _SUCCESS) { rtw_set_to_roam(adapter, 0); rtw_free_assoc_resources(adapter, 1); rtw_indicate_disconnect(adapter); } else { - pmlmepriv->to_join = true; + mlme_priv->to_join = true; } } else { rtw_indicate_disconnect(adapter); } - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); + _clr_fwstate_(mlme_priv, _FW_UNDER_LINKING); } } } else { if (rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) { - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && - check_fwstate(pmlmepriv, _FW_LINKED)) { - if (rtw_select_roaming_candidate(pmlmepriv) == _SUCCESS) { - receive_disconnect(adapter, pmlmepriv->cur_network.network.mac_address + if (check_fwstate(mlme_priv, WIFI_STATION_STATE) && + check_fwstate(mlme_priv, _FW_LINKED)) { + if (rtw_select_roaming_candidate(mlme_priv) == _SUCCESS) { + receive_disconnect(adapter, mlme_priv->cur_network.network.mac_address , WLAN_REASON_ACTIVE_ROAM); } } @@ -768,7 +768,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *buf) } unlock: - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); rtw_os_xmit_schedule(adapter); @@ -785,10 +785,10 @@ void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *buf) { } -static void free_scanqueue(struct mlme_priv *pmlmepriv) +static void free_scanqueue(struct mlme_priv *mlme_priv) { - struct __queue *free_queue = &pmlmepriv->free_bss_pool; - struct __queue *scan_queue = &pmlmepriv->scanned_queue; + struct __queue *free_queue = &mlme_priv->free_bss_pool; + struct __queue *scan_queue = &mlme_priv->scanned_queue; struct list_head *plist, *phead, *ptemp; spin_lock_bh(&scan_queue->lock); @@ -811,34 +811,34 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv) static void find_network(struct adapter *adapter) { struct wlan_network *pwlan = NULL; - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; - struct wlan_network *tgt_network = &pmlmepriv->cur_network; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; + struct wlan_network *tgt_network = &mlme_priv->cur_network; - pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.mac_address); + pwlan = rtw_find_network(&mlme_priv->scanned_queue, tgt_network->network.mac_address); if (!pwlan) return; pwlan->fixed = false; - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) && + if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE) && (adapter->stapriv.asoc_sta_count == 1)) rtw_free_network_nolock(adapter, pwlan); } -/* rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock */ +/* rtw_free_assoc_resources: the caller has to lock mlme_priv->lock */ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue) { - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; - struct wlan_network *tgt_network = &pmlmepriv->cur_network; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; + struct wlan_network *tgt_network = &mlme_priv->cur_network; - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_AP_STATE)) { + if (check_fwstate(mlme_priv, WIFI_STATION_STATE | WIFI_AP_STATE)) { struct sta_info *psta; psta = rtw_get_stainfo(&adapter->stapriv, tgt_network->network.mac_address); rtw_free_stainfo(adapter, psta); } - if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE | WIFI_ADHOC_MASTER_STATE | WIFI_AP_STATE)) { + if (check_fwstate(mlme_priv, WIFI_ADHOC_STATE | WIFI_ADHOC_MASTER_STATE | WIFI_AP_STATE)) { struct sta_info *psta; rtw_free_all_stainfo(adapter); @@ -855,18 +855,18 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue) adapter->securitypriv.key_mask = 0; } -/* rtw_indicate_connect: the caller has to lock pmlmepriv->lock */ +/* rtw_indicate_connect: the caller has to lock mlme_priv->lock */ void rtw_indicate_connect(struct adapter *padapter) { - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; - pmlmepriv->to_join = false; + mlme_priv->to_join = false; if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED)) { - set_fwstate(pmlmepriv, _FW_LINKED); + set_fwstate(mlme_priv, _FW_LINKED); - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) || - check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) + if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE) || + check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) rtw_cfg80211_ibss_indicate_connect(padapter); else rtw_cfg80211_indicate_connect(padapter); @@ -881,15 +881,15 @@ void rtw_indicate_connect(struct adapter *padapter) rtw_set_scan_deny(padapter, 3000); } -/* rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock */ +/* rtw_indicate_disconnect: the caller has to lock mlme_priv->lock */ void rtw_indicate_disconnect(struct adapter *padapter) { - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING | WIFI_UNDER_WPS); + _clr_fwstate_(mlme_priv, _FW_UNDER_LINKING | WIFI_UNDER_WPS); if (rtw_to_roam(padapter) > 0) - _clr_fwstate_(pmlmepriv, _FW_LINKED); + _clr_fwstate_(mlme_priv, _FW_LINKED); if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) || rtw_to_roam(padapter) <= 0) { /* Do it first for tx broadcast pkt after disconnection issue! */ @@ -902,7 +902,7 @@ void rtw_indicate_disconnect(struct adapter *padapter) /* set ips_deny_time to avoid enter IPS before LPS leave */ rtw_set_ips_deny(padapter, 3000); - _clr_fwstate_(pmlmepriv, _FW_LINKED); + _clr_fwstate_(mlme_priv, _FW_LINKED); rtw_clear_scan_deny(padapter); } @@ -925,12 +925,12 @@ inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted) void rtw_scan_abort(struct adapter *adapter) { unsigned long start; - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; start = jiffies; pmlmeext->scan_abort = true; - while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) + while (check_fwstate(mlme_priv, _FW_UNDER_SURVEY) && jiffies_to_msecs(start) <= 200) { if (adapter->driver_stopped || adapter->bSurpriseRemoved) break; @@ -938,7 +938,7 @@ void rtw_scan_abort(struct adapter *adapter) msleep(20); } - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) + if (check_fwstate(mlme_priv, _FW_UNDER_SURVEY)) rtw_indicate_scan_done(adapter, true); pmlmeext->scan_abort = false; @@ -1031,8 +1031,8 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_network *ptarget_wlan, struct wlan_network *pnetwork) { - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct wlan_network *cur_network = &pmlmepriv->cur_network; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct wlan_network *cur_network = &mlme_priv->cur_network; /* why not use ptarget_wlan?? */ memcpy(&cur_network->network, &pnetwork->network, pnetwork->network.length); @@ -1055,17 +1055,17 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net switch (pnetwork->network.infrastructure_mode) { case NL80211_IFTYPE_STATION: - if (pmlmepriv->fw_state & WIFI_UNDER_WPS) - pmlmepriv->fw_state = WIFI_STATION_STATE | WIFI_UNDER_WPS; + if (mlme_priv->fw_state & WIFI_UNDER_WPS) + mlme_priv->fw_state = WIFI_STATION_STATE | WIFI_UNDER_WPS; else - pmlmepriv->fw_state = WIFI_STATION_STATE; + mlme_priv->fw_state = WIFI_STATION_STATE; break; case NL80211_IFTYPE_ADHOC: - pmlmepriv->fw_state = WIFI_ADHOC_STATE; + mlme_priv->fw_state = WIFI_ADHOC_STATE; break; default: - pmlmepriv->fw_state = WIFI_NULL_STATE; + mlme_priv->fw_state = WIFI_NULL_STATE; break; } @@ -1147,9 +1147,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *buf) { struct sta_info *ptarget_sta = NULL, *pcur_sta = NULL; struct sta_priv *pstapriv = &adapter->stapriv; - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct wlan_network *pnetwork = (struct wlan_network *)buf; - struct wlan_network *cur_network = &pmlmepriv->cur_network; + struct wlan_network *cur_network = &mlme_priv->cur_network; struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL; unsigned int the_same_macaddr = false; @@ -1159,43 +1159,43 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *buf) if (pnetwork->network.length > sizeof(struct wlan_bssid_ex)) return; - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); - pmlmepriv->link_detect_info.traffic_transition_count = 0; - pmlmepriv->link_detect_info.low_power_transition_count = 0; + mlme_priv->link_detect_info.traffic_transition_count = 0; + mlme_priv->link_detect_info.low_power_transition_count = 0; if (pnetwork->join_res == -4) { rtw_reset_securitypriv(adapter); - _set_timer(&pmlmepriv->assoc_timer, 1); + _set_timer(&mlme_priv->assoc_timer, 1); - if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); + if (check_fwstate(mlme_priv, _FW_UNDER_LINKING)) + _clr_fwstate_(mlme_priv, _FW_UNDER_LINKING); - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); return; } if (pnetwork->join_res <= 0) { /* if join_res < 0 (join fails), then try again */ - _set_timer(&pmlmepriv->assoc_timer, 1); - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); - spin_unlock_bh(&pmlmepriv->lock); + _set_timer(&mlme_priv->assoc_timer, 1); + _clr_fwstate_(mlme_priv, _FW_UNDER_LINKING); + spin_unlock_bh(&mlme_priv->lock); return; } - spin_lock_bh(&pmlmepriv->scanned_queue.lock); + spin_lock_bh(&mlme_priv->scanned_queue.lock); - if (!check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) { - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); - spin_unlock_bh(&pmlmepriv->lock); + if (!check_fwstate(mlme_priv, _FW_UNDER_LINKING)) { + spin_unlock_bh(&mlme_priv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->lock); return; } /* s1. find ptarget_wlan */ - if (check_fwstate(pmlmepriv, _FW_LINKED)) { + if (check_fwstate(mlme_priv, _FW_LINKED)) { if (the_same_macaddr) { - ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.mac_address); + ptarget_wlan = rtw_find_network(&mlme_priv->scanned_queue, cur_network->network.mac_address); } else { - pcur_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.mac_address); + pcur_wlan = rtw_find_network(&mlme_priv->scanned_queue, cur_network->network.mac_address); if (pcur_wlan) pcur_wlan->fixed = false; @@ -1203,15 +1203,15 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *buf) if (pcur_sta) rtw_free_stainfo(adapter, pcur_sta); - ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.mac_address); - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { + ptarget_wlan = rtw_find_network(&mlme_priv->scanned_queue, pnetwork->network.mac_address); + if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { if (ptarget_wlan) ptarget_wlan->fixed = true; } } } else { - ptarget_wlan = _rtw_find_same_network(&pmlmepriv->scanned_queue, pnetwork); - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { + ptarget_wlan = _rtw_find_same_network(&mlme_priv->scanned_queue, pnetwork); + if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { if (ptarget_wlan) ptarget_wlan->fixed = true; } @@ -1221,34 +1221,34 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *buf) if (!ptarget_wlan) { netdev_dbg(adapter->pnetdev, "Can't find ptarget_wlan when joinbss_event callback\n"); - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->lock); return; } rtw_joinbss_update_network(adapter, ptarget_wlan, pnetwork); /* s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode */ - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { + if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { ptarget_sta = rtw_joinbss_update_stainfo(adapter, pnetwork); if (!ptarget_sta) { - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->lock); return; } } /* s4. indicate connect */ - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { - pmlmepriv->cur_network_scanned = ptarget_wlan; + if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { + mlme_priv->cur_network_scanned = ptarget_wlan; rtw_indicate_connect(adapter); } - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); /* s5. Cancel assoc_timer */ - timer_delete_sync(&pmlmepriv->assoc_timer); + timer_delete_sync(&mlme_priv->assoc_timer); } void rtw_joinbss_event_callback(struct adapter *adapter, u8 *buf) @@ -1275,15 +1275,15 @@ void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *psta, u3 void rtw_stassoc_event_callback(struct adapter *adapter, u8 *buf) { struct sta_info *psta; - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct stassoc_event *pstassoc = (struct stassoc_event *)buf; - struct wlan_network *cur_network = &pmlmepriv->cur_network; + struct wlan_network *cur_network = &mlme_priv->cur_network; struct wlan_network *ptarget_wlan = NULL; if (!rtw_access_ctrl(adapter, pstassoc->macaddr)) return; - if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) { + if (check_fwstate(mlme_priv, WIFI_AP_STATE)) { psta = rtw_get_stainfo(&adapter->stapriv, pstassoc->macaddr); if (psta) { u8 *passoc_req = NULL; @@ -1342,23 +1342,23 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *buf) psta->ieee8021x_blocked = false; - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) || - check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { + if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE) || + check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) { if (adapter->stapriv.asoc_sta_count == 2) { - spin_lock_bh(&pmlmepriv->scanned_queue.lock); - ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.mac_address); - pmlmepriv->cur_network_scanned = ptarget_wlan; + spin_lock_bh(&mlme_priv->scanned_queue.lock); + ptarget_wlan = rtw_find_network(&mlme_priv->scanned_queue, cur_network->network.mac_address); + mlme_priv->cur_network_scanned = ptarget_wlan; if (ptarget_wlan) ptarget_wlan->fixed = true; - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); /* a sta + bc/mc_stainfo (not Ibss_stainfo) */ rtw_indicate_connect(adapter); } } - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); mlmeext_sta_add_event_callback(adapter, psta); } @@ -1370,9 +1370,9 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *buf) struct wlan_network *pwlan = NULL; struct wlan_bssid_ex *pdev_network = NULL; u8 *pibss = NULL; - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct stadel_event *pstadel = (struct stadel_event *)buf; - struct wlan_network *tgt_network = &pmlmepriv->cur_network; + struct wlan_network *tgt_network = &mlme_priv->cur_network; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; @@ -1390,15 +1390,15 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *buf) rtw_hal_set_hwreg(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_status); } - /* if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) */ + /* if (check_fwstate(mlme_priv, WIFI_AP_STATE)) */ if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) return; mlmeext_sta_del_event_callback(adapter); - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { + if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { u16 reason = *((unsigned short *)(pstadel->rsvd)); bool roam = false; struct wlan_network *roam_target = NULL; @@ -1409,7 +1409,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *buf) roam = true; } else if (reason == WLAN_REASON_ACTIVE_ROAM && rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) { roam = true; - roam_target = pmlmepriv->roam_network; + roam_target = mlme_priv->roam_network; } if (roam) { @@ -1426,48 +1426,48 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *buf) rtw_free_assoc_resources(adapter, 1); rtw_indicate_disconnect(adapter); - spin_lock_bh(&pmlmepriv->scanned_queue.lock); + spin_lock_bh(&mlme_priv->scanned_queue.lock); /* remove the network entry in scanned_queue */ - pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.mac_address); + pwlan = rtw_find_network(&mlme_priv->scanned_queue, tgt_network->network.mac_address); if (pwlan) { pwlan->fixed = false; rtw_free_network_nolock(adapter, pwlan); } - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); _rtw_roaming(adapter, roam_target); } - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) || - check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { + if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE) || + check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) { rtw_free_stainfo(adapter, psta); if (adapter->stapriv.asoc_sta_count == 1) {/* a sta + bc/mc_stainfo (not Ibss_stainfo) */ u8 ret = _SUCCESS; - spin_lock_bh(&pmlmepriv->scanned_queue.lock); + spin_lock_bh(&mlme_priv->scanned_queue.lock); /* free old ibss network */ - pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.mac_address); + pwlan = rtw_find_network(&mlme_priv->scanned_queue, tgt_network->network.mac_address); if (pwlan) { pwlan->fixed = false; rtw_free_network_nolock(adapter, pwlan); } - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); /* re-create ibss */ pdev_network = &adapter->registrypriv.dev_network; pibss = adapter->registrypriv.dev_network.mac_address; memcpy(pdev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_network->network)); - memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); + memcpy(&pdev_network->ssid, &mlme_priv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); rtw_update_registrypriv_dev_network(adapter); rtw_generate_random_ibss(pibss); - if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { - set_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE); - _clr_fwstate_(pmlmepriv, WIFI_ADHOC_STATE); + if (check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) { + set_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE); + _clr_fwstate_(mlme_priv, WIFI_ADHOC_STATE); } ret = rtw_createbss_cmd(adapter); @@ -1477,7 +1477,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *buf) } unlock: - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); } void rtw_cpwm_event_callback(struct adapter *padapter, u8 *buf) @@ -1502,12 +1502,12 @@ void _rtw_join_timeout_handler(struct timer_list *t) { struct adapter *adapter = timer_container_of(adapter, t, mlmepriv.assoc_timer); - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; if (adapter->driver_stopped || adapter->bSurpriseRemoved) return; - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); if (rtw_to_roam(adapter) > 0) { /* join timeout caused by roaming */ while (1) { @@ -1528,13 +1528,13 @@ void _rtw_join_timeout_handler(struct timer_list *t) } else { rtw_indicate_disconnect(adapter); - free_scanqueue(pmlmepriv);/* */ + free_scanqueue(mlme_priv);/* */ /* indicate disconnect for the case that join_timeout and check_fwstate != FW_LINKED */ rtw_cfg80211_indicate_disconnect(adapter); } - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); } /* @@ -1545,13 +1545,13 @@ void rtw_scan_timeout_handler(struct timer_list *t) { struct adapter *adapter = timer_container_of(adapter, t, mlmepriv.scan_to_timer); - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); - _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); + _clr_fwstate_(mlme_priv, _FW_UNDER_SURVEY); - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); rtw_indicate_scan_done(adapter, true); } @@ -1577,17 +1577,17 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *adapter) static void rtw_auto_scan_handler(struct adapter *padapter) { - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; rtw_mlme_reset_auto_scan_int(padapter); - if (pmlmepriv->auto_scan_int_ms != 0 && - jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time) > pmlmepriv->auto_scan_int_ms) { + if (mlme_priv->auto_scan_int_ms != 0 && + jiffies_to_msecs(jiffies - mlme_priv->scan_start_time) > mlme_priv->auto_scan_int_ms) { if (!padapter->registrypriv.wifi_spec) { - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) + if (check_fwstate(mlme_priv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) goto exit; - if (pmlmepriv->link_detect_info.busy_traffic) + if (mlme_priv->link_detect_info.busy_traffic) goto exit; } @@ -1786,34 +1786,34 @@ exit: * Calling context: * The caller of the sub-routine will be in critical section... * The caller must hold the following spinlock - * pmlmepriv->lock + * mlme_priv->lock */ -int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) +int rtw_select_and_join_from_scanned_queue(struct mlme_priv *mlme_priv) { int ret; struct list_head *phead; struct adapter *adapter; - struct __queue *queue = &pmlmepriv->scanned_queue; + struct __queue *queue = &mlme_priv->scanned_queue; struct wlan_network *pnetwork = NULL; struct wlan_network *candidate = NULL; - adapter = (struct adapter *)pmlmepriv->nic_hdl; + adapter = (struct adapter *)mlme_priv->nic_hdl; - spin_lock_bh(&pmlmepriv->scanned_queue.lock); + spin_lock_bh(&mlme_priv->scanned_queue.lock); - if (pmlmepriv->roam_network) { - candidate = pmlmepriv->roam_network; - pmlmepriv->roam_network = NULL; + if (mlme_priv->roam_network) { + candidate = mlme_priv->roam_network; + mlme_priv->roam_network = NULL; goto candidate_exist; } phead = get_list_head(queue); - list_for_each(pmlmepriv->pscanned, phead) { - pnetwork = list_entry(pmlmepriv->pscanned, + list_for_each(mlme_priv->pscanned, phead) { + pnetwork = list_entry(mlme_priv->pscanned, struct wlan_network, list); - rtw_check_join_candidate(pmlmepriv, &candidate, pnetwork); + rtw_check_join_candidate(mlme_priv, &candidate, pnetwork); } if (!candidate) { @@ -1826,17 +1826,17 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) candidate_exist: /* check for situation of _FW_LINKED */ - if (check_fwstate(pmlmepriv, _FW_LINKED)) { + if (check_fwstate(mlme_priv, _FW_LINKED)) { rtw_disassoc_cmd(adapter, 0, true); rtw_indicate_disconnect(adapter); rtw_free_assoc_resources(adapter, 0); } - set_fwstate(pmlmepriv, _FW_UNDER_LINKING); + set_fwstate(mlme_priv, _FW_UNDER_LINKING); ret = rtw_joinbss_cmd(adapter, candidate); exit: - spin_unlock_bh(&pmlmepriv->scanned_queue.lock); + spin_unlock_bh(&mlme_priv->scanned_queue.lock); return ret; } @@ -2067,7 +2067,7 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u uint ielength; int iEntry; - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct security_priv *psecuritypriv = &adapter->securitypriv; uint ndisauthmode = psecuritypriv->ndisauthtype; @@ -2079,7 +2079,7 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u if ((ndisauthmode == Ndis802_11AuthModeWPA2) || (ndisauthmode == Ndis802_11AuthModeWPA2PSK)) authmode = WLAN_EID_RSN; - if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) { + if (check_fwstate(mlme_priv, WIFI_UNDER_WPS)) { memcpy(out_ie + ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_len); ielength += psecuritypriv->wps_ie_len; @@ -2090,7 +2090,7 @@ 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, pmlmepriv->assoc_bssid); + iEntry = SecIsInPMKIDList(adapter, mlme_priv->assoc_bssid); if (iEntry < 0) return ielength; @@ -2152,15 +2152,15 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter) void rtw_joinbss_reset(struct adapter *padapter) { u8 threshold; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; - struct ht_priv *phtpriv = &pmlmepriv->htpriv; + struct ht_priv *phtpriv = &mlme_priv->htpriv; /* todo: if you want to do something io/reg/hw setting before join_bss, please add code here */ - pmlmepriv->num_FortyMHzIntolerant = 0; + mlme_priv->num_FortyMHzIntolerant = 0; - pmlmepriv->num_sta_no_ht = 0; + mlme_priv->num_sta_no_ht = 0; phtpriv->ampdu_enable = false;/* reset to disabled */ @@ -2180,8 +2180,8 @@ void rtw_joinbss_reset(struct adapter *padapter) void rtw_ht_use_default_setting(struct adapter *padapter) { - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct ht_priv *phtpriv = &pmlmepriv->htpriv; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct ht_priv *phtpriv = &mlme_priv->htpriv; struct registry_priv *pregistrypriv = &padapter->registrypriv; bool bHwLDPCSupport = false, bHwSTBCSupport = false; bool bHwSupportBeamformer = false, bHwSupportBeamformee = false; @@ -2254,8 +2254,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ struct ieee80211_ht_cap ht_capie; u8 cbw40_enable = 0, stbc_rx_enable = 0, operation_bw = 0; struct registry_priv *pregistrypriv = &padapter->registrypriv; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct ht_priv *phtpriv = &pmlmepriv->htpriv; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct ht_priv *phtpriv = &mlme_priv->htpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; phtpriv->ht_option = false; @@ -2272,7 +2272,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ /* Get HT BW */ if (!in_ie) { /* TDLS: TODO 20/40 issue */ - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { + if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { operation_bw = padapter->mlmeextpriv.cur_bwmode; if (operation_bw > CHANNEL_WIDTH_40) operation_bw = CHANNEL_WIDTH_40; @@ -2375,8 +2375,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe u8 *p, max_ampdu_sz; int len; struct ieee80211_ht_cap *pht_capie; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct ht_priv *phtpriv = &pmlmepriv->htpriv; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct ht_priv *phtpriv = &mlme_priv->htpriv; struct registry_priv *pregistrypriv = &padapter->registrypriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; @@ -2494,8 +2494,8 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr void rtw_append_exented_cap(struct adapter *padapter, u8 *out_ie, uint *pout_len) { - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct ht_priv *phtpriv = &pmlmepriv->htpriv; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct ht_priv *phtpriv = &mlme_priv->htpriv; u8 cap_content[8] = {0}; if (phtpriv->bss_coexist) @@ -2524,22 +2524,22 @@ inline u8 rtw_to_roam(struct adapter *adapter) void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network) { - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; - spin_lock_bh(&pmlmepriv->lock); + spin_lock_bh(&mlme_priv->lock); _rtw_roaming(padapter, tgt_network); - spin_unlock_bh(&pmlmepriv->lock); + spin_unlock_bh(&mlme_priv->lock); } void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network) { - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct wlan_network *cur_network = &pmlmepriv->cur_network; + struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct wlan_network *cur_network = &mlme_priv->cur_network; if (rtw_to_roam(padapter) > 0) { - memcpy(&pmlmepriv->assoc_ssid, &cur_network->network.ssid, sizeof(struct ndis_802_11_ssid)); + memcpy(&mlme_priv->assoc_ssid, &cur_network->network.ssid, sizeof(struct ndis_802_11_ssid)); - pmlmepriv->assoc_by_bssid = false; + mlme_priv->assoc_by_bssid = false; while (rtw_do_join(padapter) != _SUCCESS) { rtw_dec_to_roam(padapter); -- cgit v1.2.3 From 20c305c041c6f6a716048ef8c7bced0329530f6d Mon Sep 17 00:00:00 2001 From: Dalvin-Ehinoma Noah Aiguobas Date: Fri, 31 Jul 2026 10:41:26 +0000 Subject: staging: rtl8723bs: renaming variable pdev_network in rtw_mlme.c Renaming occurrences of pdev_network to dev_network since the prefix p is an old. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas Link: https://patch.msgid.link/20260731104134.12754-4-fliegbert2@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 276bf83fa024..37640ea9edc8 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -704,7 +704,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *buf) _set_timer(&mlme_priv->assoc_timer, MAX_JOIN_TIMEOUT); } else { u8 ret = _SUCCESS; - struct wlan_bssid_ex *pdev_network = + struct wlan_bssid_ex *dev_network = &adapter->registrypriv.dev_network; u8 *pibss = adapter->registrypriv.dev_network.mac_address; @@ -712,7 +712,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *buf) /* mlme_priv->fw_state ^= _FW_UNDER_SURVEY;because don't set assoc_timer */ _clr_fwstate_(mlme_priv, _FW_UNDER_SURVEY); - memcpy(&pdev_network->ssid, &mlme_priv->assoc_ssid, + memcpy(&dev_network->ssid, &mlme_priv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); rtw_update_registrypriv_dev_network(adapter); @@ -1368,7 +1368,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *buf) int mac_id = (-1); struct sta_info *psta; struct wlan_network *pwlan = NULL; - struct wlan_bssid_ex *pdev_network = NULL; + struct wlan_bssid_ex *dev_network = NULL; u8 *pibss = NULL; struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct stadel_event *pstadel = (struct stadel_event *)buf; @@ -1454,12 +1454,12 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *buf) } spin_unlock_bh(&mlme_priv->scanned_queue.lock); /* re-create ibss */ - pdev_network = &adapter->registrypriv.dev_network; + dev_network = &adapter->registrypriv.dev_network; pibss = adapter->registrypriv.dev_network.mac_address; - memcpy(pdev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_network->network)); + memcpy(dev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_network->network)); - memcpy(&pdev_network->ssid, &mlme_priv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); + memcpy(&dev_network->ssid, &mlme_priv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); rtw_update_registrypriv_dev_network(adapter); @@ -2104,48 +2104,48 @@ void rtw_init_registrypriv_dev_network(struct adapter *adapter) { struct registry_priv *pregistrypriv = &adapter->registrypriv; struct eeprom_priv *peepriv = &adapter->eeprompriv; - struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network; + struct wlan_bssid_ex *dev_network = &pregistrypriv->dev_network; u8 *myhwaddr = myid(peepriv); - memcpy(pdev_network->mac_address, myhwaddr, ETH_ALEN); + memcpy(dev_network->mac_address, myhwaddr, ETH_ALEN); - memcpy(&pdev_network->ssid, &pregistrypriv->ssid, sizeof(struct ndis_802_11_ssid)); + memcpy(&dev_network->ssid, &pregistrypriv->ssid, sizeof(struct ndis_802_11_ssid)); - pdev_network->configuration.length = sizeof(struct ndis_802_11_conf); - pdev_network->configuration.beacon_period = 100; + dev_network->configuration.length = sizeof(struct ndis_802_11_conf); + dev_network->configuration.beacon_period = 100; } void rtw_update_registrypriv_dev_network(struct adapter *adapter) { int sz = 0; struct registry_priv *pregistrypriv = &adapter->registrypriv; - struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network; + struct wlan_bssid_ex *dev_network = &pregistrypriv->dev_network; struct security_priv *psecuritypriv = &adapter->securitypriv; struct wlan_network *cur_network = &adapter->mlmepriv.cur_network; - pdev_network->privacy = (psecuritypriv->dot11_privacy_algrthm > 0 ? 1 : 0) ; /* adhoc no 802.1x */ + dev_network->privacy = (psecuritypriv->dot11_privacy_algrthm > 0 ? 1 : 0) ; /* adhoc no 802.1x */ - pdev_network->rssi = 0; + dev_network->rssi = 0; - pdev_network->configuration.ds_config = (pregistrypriv->channel); + dev_network->configuration.ds_config = (pregistrypriv->channel); if (cur_network->network.infrastructure_mode == NL80211_IFTYPE_ADHOC) - pdev_network->configuration.atim_window = (0); + dev_network->configuration.atim_window = (0); - pdev_network->infrastructure_mode = (cur_network->network.infrastructure_mode); + dev_network->infrastructure_mode = (cur_network->network.infrastructure_mode); /* 1. Supported rates */ /* 2. IE */ - /* rtw_set_supported_rate(pdev_network->supported_rates, pregistrypriv->wireless_mode) ; will be called in rtw_generate_ie */ + /* rtw_set_supported_rate(dev_network->supported_rates, pregistrypriv->wireless_mode) ; will be called in rtw_generate_ie */ sz = rtw_generate_ie(pregistrypriv); - pdev_network->ie_length = sz; + dev_network->ie_length = sz; - pdev_network->length = get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pdev_network); + dev_network->length = get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)dev_network); /* notes: translate ie_length & length after assign the length to cmdsz in createbss_cmd(); */ - /* pdev_network->ie_length = cpu_to_le32(sz); */ + /* dev_network->ie_length = cpu_to_le32(sz); */ } /* the function is at passive_level */ -- cgit v1.2.3 From d013ec44990de23e03f9ed67274da5bbffb1a783 Mon Sep 17 00:00:00 2001 From: Dalvin-Ehinoma Noah Aiguobas Date: Fri, 31 Jul 2026 10:41:27 +0000 Subject: staging: rtl8723bs: renaming variable pibss in rtw_mlme.c Renaming occurrences of pibss to ibss since the prefix p is an old naming convention to indicate a pointer variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas Link: https://patch.msgid.link/20260731104134.12754-5-fliegbert2@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 37640ea9edc8..761cbff86bbb 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -271,16 +271,16 @@ bool rtw_if_up(struct adapter *padapter) return true; } -void rtw_generate_random_ibss(u8 *pibss) +void rtw_generate_random_ibss(u8 *ibss) { unsigned long curtime = jiffies; - pibss[0] = 0x02; /* in ad-hoc mode bit1 must set to 1 */ - pibss[1] = 0x11; - pibss[2] = 0x87; - pibss[3] = (u8)(curtime & 0xff) ;/* p[0]; */ - pibss[4] = (u8)((curtime >> 8) & 0xff) ;/* p[1]; */ - pibss[5] = (u8)((curtime >> 16) & 0xff) ;/* p[2]; */ + ibss[0] = 0x02; /* in ad-hoc mode bit1 must set to 1 */ + ibss[1] = 0x11; + ibss[2] = 0x87; + ibss[3] = (u8)(curtime & 0xff) ;/* p[0]; */ + ibss[4] = (u8)((curtime >> 8) & 0xff) ;/* p[1]; */ + ibss[5] = (u8)((curtime >> 16) & 0xff) ;/* p[2]; */ } u8 *rtw_get_capability_from_ie(u8 *ie) @@ -707,7 +707,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *buf) struct wlan_bssid_ex *dev_network = &adapter->registrypriv.dev_network; - u8 *pibss = adapter->registrypriv.dev_network.mac_address; + u8 *ibss = adapter->registrypriv.dev_network.mac_address; /* mlme_priv->fw_state ^= _FW_UNDER_SURVEY;because don't set assoc_timer */ _clr_fwstate_(mlme_priv, _FW_UNDER_SURVEY); @@ -716,7 +716,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *buf) sizeof(struct ndis_802_11_ssid)); rtw_update_registrypriv_dev_network(adapter); - rtw_generate_random_ibss(pibss); + rtw_generate_random_ibss(ibss); mlme_priv->fw_state = WIFI_ADHOC_MASTER_STATE; @@ -1369,7 +1369,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *buf) struct sta_info *psta; struct wlan_network *pwlan = NULL; struct wlan_bssid_ex *dev_network = NULL; - u8 *pibss = NULL; + u8 *ibss = NULL; struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct stadel_event *pstadel = (struct stadel_event *)buf; struct wlan_network *tgt_network = &mlme_priv->cur_network; @@ -1455,7 +1455,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *buf) spin_unlock_bh(&mlme_priv->scanned_queue.lock); /* re-create ibss */ dev_network = &adapter->registrypriv.dev_network; - pibss = adapter->registrypriv.dev_network.mac_address; + ibss = adapter->registrypriv.dev_network.mac_address; memcpy(dev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_network->network)); @@ -1463,7 +1463,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *buf) rtw_update_registrypriv_dev_network(adapter); - rtw_generate_random_ibss(pibss); + rtw_generate_random_ibss(ibss); if (check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) { set_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE); -- cgit v1.2.3 From 9069b9328b6b9a131b30a790a6f034092862add0 Mon Sep 17 00:00:00 2001 From: Dalvin-Ehinoma Noah Aiguobas Date: Fri, 31 Jul 2026 10:41:28 +0000 Subject: staging: rtl8723bs: renaming variable padapter in rtw_mlme.c Renaming occurrences of padapter to adapter since the prefix p is an old naming convention to indicate a pointer variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas Link: https://patch.msgid.link/20260731104134.12754-6-fliegbert2@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 268 +++++++++++++++--------------- 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 761cbff86bbb..e46e137a1adf 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -27,9 +27,9 @@ static void _rtw_set_scan_deny_timer_hdl(struct timer_list *t) rtw_clear_scan_deny(adapter); } -static void rtw_init_mlme_timer(struct adapter *padapter) +static void rtw_init_mlme_timer(struct adapter *adapter) { - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; timer_setup(&mlme_priv->assoc_timer, _rtw_join_timeout_handler, 0); timer_setup(&mlme_priv->scan_to_timer, rtw_scan_timeout_handler, 0); @@ -39,15 +39,15 @@ static void rtw_init_mlme_timer(struct adapter *padapter) _rtw_set_scan_deny_timer_hdl, 0); } -int rtw_init_mlme_priv(struct adapter *padapter) +int rtw_init_mlme_priv(struct adapter *adapter) { int i; u8 *buf; struct wlan_network *pnetwork; - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; int res = _SUCCESS; - mlme_priv->nic_hdl = (u8 *)padapter; + mlme_priv->nic_hdl = (u8 *)adapter; mlme_priv->pscanned = NULL; mlme_priv->fw_state = WIFI_STATION_STATE; /* Must sync with rtw_wdev_alloc() */ @@ -82,7 +82,7 @@ int rtw_init_mlme_priv(struct adapter *padapter) /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ - rtw_clear_scan_deny(padapter); + rtw_clear_scan_deny(adapter); #define RTW_ROAM_SCAN_RESULT_EXP_MS 5000 #define RTW_ROAM_RSSI_DIFF_TH 10 @@ -97,7 +97,7 @@ int rtw_init_mlme_priv(struct adapter *padapter) mlme_priv->roam_rssi_diff_th = RTW_ROAM_RSSI_DIFF_TH; mlme_priv->roam_scan_int_ms = RTW_ROAM_SCAN_INTERVAL_MS; - rtw_init_mlme_timer(padapter); + rtw_init_mlme_timer(adapter); exit: @@ -243,11 +243,11 @@ exit: return pnetwork; } -void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall) +void rtw_free_network_queue(struct adapter *adapter, u8 isfreeall) { struct list_head *phead, *plist, *tmp; struct wlan_network *pnetwork; - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct __queue *scanned_queue = &mlme_priv->scanned_queue; spin_lock_bh(&scanned_queue->lock); @@ -262,10 +262,10 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall) spin_unlock_bh(&scanned_queue->lock); } -bool rtw_if_up(struct adapter *padapter) +bool rtw_if_up(struct adapter *adapter) { - if (padapter->driver_stopped || padapter->bSurpriseRemoved || - !check_fwstate(&padapter->mlmepriv, _FW_LINKED)) + if (adapter->driver_stopped || adapter->bSurpriseRemoved || + !check_fwstate(&adapter->mlmepriv, _FW_LINKED)) return false; return true; @@ -307,11 +307,11 @@ void rtw_free_mlme_priv(struct mlme_priv *mlme_priv) _rtw_free_mlme_priv(mlme_priv); } -void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork); -void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork) +void rtw_free_network_nolock(struct adapter *adapter, struct wlan_network *pnetwork); +void rtw_free_network_nolock(struct adapter *adapter, struct wlan_network *pnetwork) { - _rtw_free_network_nolock(&padapter->mlmepriv, pnetwork); - rtw_cfg80211_unlink_bss(padapter, pnetwork); + _rtw_free_network_nolock(&adapter->mlmepriv, pnetwork); + rtw_cfg80211_unlink_bss(adapter, pnetwork); } /* @@ -406,7 +406,7 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue) } void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, - struct adapter *padapter, bool update_ie) + struct adapter *adapter, bool update_ie) { long rssi_ori = dst->rssi; @@ -417,10 +417,10 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, long rssi_final; /* The rule below is 1/5 for sample value, 4/5 for history value */ - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) && is_same_network(&padapter->mlmepriv.cur_network.network, src, 0)) { + if (check_fwstate(&adapter->mlmepriv, _FW_LINKED) && is_same_network(&adapter->mlmepriv.cur_network.network, src, 0)) { /* Take the recvpriv's value for the connected AP*/ - ss_final = padapter->recvpriv.signal_strength; - sq_final = padapter->recvpriv.signal_qual; + ss_final = adapter->recvpriv.signal_strength; + sq_final = adapter->recvpriv.signal_qual; /* the rssi value here is undecorated, and will be used for antenna diversity */ if (sq_smp != 101) /* from the right channel */ rssi_final = (src->rssi + dst->rssi * 4) / 5; @@ -856,69 +856,69 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue) } /* rtw_indicate_connect: the caller has to lock mlme_priv->lock */ -void rtw_indicate_connect(struct adapter *padapter) +void rtw_indicate_connect(struct adapter *adapter) { - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; mlme_priv->to_join = false; - if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED)) { + if (!check_fwstate(&adapter->mlmepriv, _FW_LINKED)) { set_fwstate(mlme_priv, _FW_LINKED); if (check_fwstate(mlme_priv, WIFI_ADHOC_MASTER_STATE) || check_fwstate(mlme_priv, WIFI_ADHOC_STATE)) - rtw_cfg80211_ibss_indicate_connect(padapter); + rtw_cfg80211_ibss_indicate_connect(adapter); else - rtw_cfg80211_indicate_connect(padapter); + rtw_cfg80211_indicate_connect(adapter); - netif_carrier_on(padapter->pnetdev); + netif_carrier_on(adapter->pnetdev); - if (padapter->pid[2] != 0) - rtw_signal_process(padapter->pid[2], SIGALRM); + if (adapter->pid[2] != 0) + rtw_signal_process(adapter->pid[2], SIGALRM); } - rtw_set_to_roam(padapter, 0); - rtw_set_scan_deny(padapter, 3000); + rtw_set_to_roam(adapter, 0); + rtw_set_scan_deny(adapter, 3000); } /* rtw_indicate_disconnect: the caller has to lock mlme_priv->lock */ -void rtw_indicate_disconnect(struct adapter *padapter) +void rtw_indicate_disconnect(struct adapter *adapter) { - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; _clr_fwstate_(mlme_priv, _FW_UNDER_LINKING | WIFI_UNDER_WPS); - if (rtw_to_roam(padapter) > 0) + if (rtw_to_roam(adapter) > 0) _clr_fwstate_(mlme_priv, _FW_LINKED); - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) || rtw_to_roam(padapter) <= 0) { + if (check_fwstate(&adapter->mlmepriv, _FW_LINKED) || rtw_to_roam(adapter) <= 0) { /* Do it first for tx broadcast pkt after disconnection issue! */ - netif_carrier_off(padapter->pnetdev); + netif_carrier_off(adapter->pnetdev); - rtw_cfg80211_indicate_disconnect(padapter); + rtw_cfg80211_indicate_disconnect(adapter); - rtw_reset_securitypriv_cmd(padapter); + rtw_reset_securitypriv_cmd(adapter); /* set ips_deny_time to avoid enter IPS before LPS leave */ - rtw_set_ips_deny(padapter, 3000); + rtw_set_ips_deny(adapter, 3000); _clr_fwstate_(mlme_priv, _FW_LINKED); - rtw_clear_scan_deny(padapter); + rtw_clear_scan_deny(adapter); } - rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1); + rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_DISCONNECT, 1); } -inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted) +inline void rtw_indicate_scan_done(struct adapter *adapter, bool aborted) { - rtw_cfg80211_indicate_scan_done(padapter, aborted); + rtw_cfg80211_indicate_scan_done(adapter, aborted); - if ((!adapter_to_pwrctl(padapter)->bInSuspend) && - (!check_fwstate(&padapter->mlmepriv, + if ((!adapter_to_pwrctl(adapter)->bInSuspend) && + (!check_fwstate(&adapter->mlmepriv, WIFI_ASOC_STATE | WIFI_UNDER_LINKING))) { - rtw_set_ips_deny(padapter, 0); - _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 1); + rtw_set_ips_deny(adapter, 0); + _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 1); } } @@ -944,13 +944,13 @@ void rtw_scan_abort(struct adapter *adapter) pmlmeext->scan_abort = false; } -static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, struct wlan_network *pnetwork) +static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *adapter, struct wlan_network *pnetwork) { int i; struct sta_info *bmc_sta, *psta = NULL; struct recv_reorder_ctrl *preorder_ctrl; - struct sta_priv *pstapriv = &padapter->stapriv; - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + struct sta_priv *pstapriv = &adapter->stapriv; + struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; psta = rtw_get_stainfo(pstapriv, pnetwork->network.mac_address); if (!psta) @@ -960,27 +960,27 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str psta->aid = pnetwork->join_res; - update_sta_info(padapter, psta); + update_sta_info(adapter, psta); /* update station supportRate */ psta->bssratelen = rtw_get_rateset_len(pnetwork->network.supported_rates); memcpy(psta->bssrateset, pnetwork->network.supported_rates, psta->bssratelen); - rtw_hal_update_sta_rate_mask(padapter, psta); + rtw_hal_update_sta_rate_mask(adapter, psta); psta->wireless_mode = pmlmeext->cur_wireless_mode; - psta->raid = networktype_to_raid_ex(padapter, psta); + psta->raid = networktype_to_raid_ex(adapter, psta); /* sta mode */ - rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true); + rtw_hal_set_odm_var(adapter, HAL_ODM_STA_INFO, psta, true); /* security related */ - if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) { - padapter->securitypriv.binstallGrpkey = false; - padapter->securitypriv.busetkipkey = false; - padapter->securitypriv.bgrpkey_handshake = false; + if (adapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) { + adapter->securitypriv.binstallGrpkey = false; + adapter->securitypriv.busetkipkey = false; + adapter->securitypriv.bgrpkey_handshake = false; psta->ieee8021x_blocked = true; - psta->dot118021XPrivacy = padapter->securitypriv.dot11_privacy_algrthm; + psta->dot118021XPrivacy = adapter->securitypriv.dot11_privacy_algrthm; memset((u8 *)&psta->dot118021x_UncstKey, 0, sizeof(union Keytype)); @@ -995,9 +995,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str /* When doing the WPS, the wps_ie_len won't equal to 0 */ /* And the Wi-Fi driver shouldn't allow the data packet to be transmitted. */ - if (padapter->securitypriv.wps_ie_len != 0) { + if (adapter->securitypriv.wps_ie_len != 0) { psta->ieee8021x_blocked = true; - padapter->securitypriv.wps_ie_len = 0; + adapter->securitypriv.wps_ie_len = 0; } /* for A-MPDU Rx reordering buffer control for bmc_sta & sta_info */ @@ -1011,7 +1011,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str preorder_ctrl->wsize_b = 64;/* max_ampdu_sz;ex. 32(kbytes) -> wsize_b =32 */ } - bmc_sta = rtw_get_bcmc_stainfo(padapter); + bmc_sta = rtw_get_bcmc_stainfo(adapter); if (bmc_sta) { for (i = 0; i < 16 ; i++) { preorder_ctrl = &bmc_sta->recvreorder_ctrl[i]; @@ -1028,10 +1028,10 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str /* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ -static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_network *ptarget_wlan, +static void rtw_joinbss_update_network(struct adapter *adapter, struct wlan_network *ptarget_wlan, struct wlan_network *pnetwork) { - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct wlan_network *cur_network = &mlme_priv->cur_network; /* why not use ptarget_wlan?? */ @@ -1042,14 +1042,14 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net cur_network->aid = pnetwork->join_res; - rtw_set_signal_stat_timer(&padapter->recvpriv); + rtw_set_signal_stat_timer(&adapter->recvpriv); - padapter->recvpriv.signal_strength = ptarget_wlan->network.phy_info.signal_strength; - padapter->recvpriv.signal_qual = ptarget_wlan->network.phy_info.signal_quality; + adapter->recvpriv.signal_strength = ptarget_wlan->network.phy_info.signal_strength; + adapter->recvpriv.signal_qual = ptarget_wlan->network.phy_info.signal_quality; /* the ptarget_wlan->network.rssi is raw data, we use ptarget_wlan->network.phy_info.signal_strength instead (has scaled) */ - padapter->recvpriv.rssi = translate_percentage_to_dbm(ptarget_wlan->network.phy_info.signal_strength); + adapter->recvpriv.rssi = translate_percentage_to_dbm(ptarget_wlan->network.phy_info.signal_strength); - rtw_set_signal_stat_timer(&padapter->recvpriv); + rtw_set_signal_stat_timer(&adapter->recvpriv); /* update fw_state will clr _FW_UNDER_LINKING here indirectly */ switch (pnetwork->network.infrastructure_mode) { @@ -1072,10 +1072,10 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net if (cur_network->network.ie_length < sizeof(struct ndis_802_11_fix_ie)) return; - rtw_update_protection(padapter, (cur_network->network.ies) + sizeof(struct ndis_802_11_fix_ie), + rtw_update_protection(adapter, (cur_network->network.ies) + sizeof(struct ndis_802_11_fix_ie), (cur_network->network.ie_length - sizeof(struct ndis_802_11_fix_ie))); - rtw_update_ht_cap(padapter, cur_network->network.ies, cur_network->network.ie_length, (u8) cur_network->network.configuration.ds_config); + 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]; @@ -1480,18 +1480,18 @@ unlock: spin_unlock_bh(&mlme_priv->lock); } -void rtw_cpwm_event_callback(struct adapter *padapter, u8 *buf) +void rtw_cpwm_event_callback(struct adapter *adapter, u8 *buf) { struct reportpwrstate_parm *preportpwrstate; preportpwrstate = (struct reportpwrstate_parm *)buf; - preportpwrstate->state |= (u8)(adapter_to_pwrctl(padapter)->cpwm_tog + 0x80); - cpwm_int_hdl(padapter, preportpwrstate); + preportpwrstate->state |= (u8)(adapter_to_pwrctl(adapter)->cpwm_tog + 0x80); + cpwm_int_hdl(adapter, preportpwrstate); } -void rtw_wmm_event_callback(struct adapter *padapter, u8 *buf) +void rtw_wmm_event_callback(struct adapter *adapter, u8 *buf) { - WMMOnAssocRsp(padapter); + WMMOnAssocRsp(adapter); } /* @@ -1575,15 +1575,15 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *adapter) } } -static void rtw_auto_scan_handler(struct adapter *padapter) +static void rtw_auto_scan_handler(struct adapter *adapter) { - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; - rtw_mlme_reset_auto_scan_int(padapter); + rtw_mlme_reset_auto_scan_int(adapter); if (mlme_priv->auto_scan_int_ms != 0 && jiffies_to_msecs(jiffies - mlme_priv->scan_start_time) > mlme_priv->auto_scan_int_ms) { - if (!padapter->registrypriv.wifi_spec) { + if (!adapter->registrypriv.wifi_spec) { if (check_fwstate(mlme_priv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) goto exit; @@ -1591,7 +1591,7 @@ static void rtw_auto_scan_handler(struct adapter *padapter) goto exit; } - rtw_set_802_11_bssid_list_scan(padapter, NULL, 0); + rtw_set_802_11_bssid_list_scan(adapter, NULL, 0); } exit: @@ -1624,7 +1624,7 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter) /* rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_ENTER, 1); */ rtw_hal_dm_watchdog_in_lps(adapter); } else { - /* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) in traffic_status_watchdog() */ + /* call rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_LEAVE, 1) in traffic_status_watchdog() */ } } else { @@ -2149,10 +2149,10 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter) } /* the function is at passive_level */ -void rtw_joinbss_reset(struct adapter *padapter) +void rtw_joinbss_reset(struct adapter *adapter) { u8 threshold; - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct ht_priv *phtpriv = &mlme_priv->htpriv; @@ -2167,22 +2167,22 @@ void rtw_joinbss_reset(struct adapter *padapter) /* TH = 1 => means that invalidate usb rx aggregation */ /* TH = 0 => means that validate usb rx aggregation, use init value. */ if (phtpriv->ht_option) { - if (padapter->registrypriv.wifi_spec == 1) + if (adapter->registrypriv.wifi_spec == 1) threshold = 1; else threshold = 0; - rtw_hal_set_hwreg(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); + rtw_hal_set_hwreg(adapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); } else { threshold = 1; - rtw_hal_set_hwreg(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); + rtw_hal_set_hwreg(adapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); } } -void rtw_ht_use_default_setting(struct adapter *padapter) +void rtw_ht_use_default_setting(struct adapter *adapter) { - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct ht_priv *phtpriv = &mlme_priv->htpriv; - struct registry_priv *pregistrypriv = &padapter->registrypriv; + struct registry_priv *pregistrypriv = &adapter->registrypriv; bool bHwLDPCSupport = false, bHwSTBCSupport = false; bool bHwSupportBeamformer = false, bHwSupportBeamformee = false; @@ -2195,34 +2195,34 @@ void rtw_ht_use_default_setting(struct adapter *padapter) phtpriv->sgi_20m = TEST_FLAG(pregistrypriv->short_gi, BIT(0)) ? true : false; /* LDPC support */ - rtw_hal_get_def_var(padapter, HAL_DEF_RX_LDPC, (u8 *)&bHwLDPCSupport); + rtw_hal_get_def_var(adapter, HAL_DEF_RX_LDPC, (u8 *)&bHwLDPCSupport); CLEAR_FLAGS(phtpriv->ldpc_cap); if (bHwLDPCSupport) { if (TEST_FLAG(pregistrypriv->ldpc_cap, BIT(4))) SET_FLAG(phtpriv->ldpc_cap, LDPC_HT_ENABLE_RX); } - rtw_hal_get_def_var(padapter, HAL_DEF_TX_LDPC, (u8 *)&bHwLDPCSupport); + rtw_hal_get_def_var(adapter, HAL_DEF_TX_LDPC, (u8 *)&bHwLDPCSupport); if (bHwLDPCSupport) { if (TEST_FLAG(pregistrypriv->ldpc_cap, BIT(5))) SET_FLAG(phtpriv->ldpc_cap, LDPC_HT_ENABLE_TX); } /* STBC */ - rtw_hal_get_def_var(padapter, HAL_DEF_TX_STBC, (u8 *)&bHwSTBCSupport); + rtw_hal_get_def_var(adapter, HAL_DEF_TX_STBC, (u8 *)&bHwSTBCSupport); CLEAR_FLAGS(phtpriv->stbc_cap); if (bHwSTBCSupport) { if (TEST_FLAG(pregistrypriv->stbc_cap, BIT(5))) SET_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_TX); } - rtw_hal_get_def_var(padapter, HAL_DEF_RX_STBC, (u8 *)&bHwSTBCSupport); + rtw_hal_get_def_var(adapter, HAL_DEF_RX_STBC, (u8 *)&bHwSTBCSupport); if (bHwSTBCSupport) { if (TEST_FLAG(pregistrypriv->stbc_cap, BIT(4))) SET_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_RX); } /* Beamforming setting */ - rtw_hal_get_def_var(padapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&bHwSupportBeamformer); - rtw_hal_get_def_var(padapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&bHwSupportBeamformee); + rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&bHwSupportBeamformer); + rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&bHwSupportBeamformee); CLEAR_FLAGS(phtpriv->beamform_cap); if (TEST_FLAG(pregistrypriv->beamform_cap, BIT(4)) && bHwSupportBeamformer) SET_FLAG(phtpriv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); @@ -2231,32 +2231,32 @@ void rtw_ht_use_default_setting(struct adapter *padapter) SET_FLAG(phtpriv->beamform_cap, BEAMFORMING_HT_BEAMFORMEE_ENABLE); } -void rtw_build_wmm_ie_ht(struct adapter *padapter, u8 *out_ie, uint *pout_len) +void rtw_build_wmm_ie_ht(struct adapter *adapter, u8 *out_ie, uint *pout_len) { unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00}; int out_len; - if (padapter->mlmepriv.qospriv.qos_option == 0) { + if (adapter->mlmepriv.qospriv.qos_option == 0) { out_len = *pout_len; rtw_set_ie(out_ie + out_len, WLAN_EID_VENDOR_SPECIFIC, _WMM_IE_Length_, WMM_IE, pout_len); - padapter->mlmepriv.qospriv.qos_option = 1; + adapter->mlmepriv.qospriv.qos_option = 1; } } /* the function is >= passive_level */ -unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len, u8 channel) +unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len, u8 channel) { u32 ielen, out_len; enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor; unsigned char *p; struct ieee80211_ht_cap ht_capie; u8 cbw40_enable = 0, stbc_rx_enable = 0, operation_bw = 0; - struct registry_priv *pregistrypriv = &padapter->registrypriv; - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct registry_priv *pregistrypriv = &adapter->registrypriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct ht_priv *phtpriv = &mlme_priv->htpriv; - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; phtpriv->ht_option = false; @@ -2273,7 +2273,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ if (!in_ie) { /* TDLS: TODO 20/40 issue */ if (check_fwstate(mlme_priv, WIFI_STATION_STATE)) { - operation_bw = padapter->mlmeextpriv.cur_bwmode; + operation_bw = adapter->mlmeextpriv.cur_bwmode; if (operation_bw > CHANNEL_WIDTH_40) operation_bw = CHANNEL_WIDTH_40; } else { @@ -2335,20 +2335,20 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ { u32 rx_packet_offset, max_recvbuf_sz; - rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset); - rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz); + rtw_hal_get_def_var(adapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset); + rtw_hal_get_def_var(adapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz); } - if (padapter->driver_rx_ampdu_factor != 0xFF) + if (adapter->driver_rx_ampdu_factor != 0xFF) max_rx_ampdu_factor = - (enum ieee80211_max_ampdu_length_exp)padapter->driver_rx_ampdu_factor; + (enum ieee80211_max_ampdu_length_exp)adapter->driver_rx_ampdu_factor; else - rtw_hal_get_def_var(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, + rtw_hal_get_def_var(adapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor); ht_capie.ampdu_params_info = (max_rx_ampdu_factor & 0x03); - if (padapter->securitypriv.dot11_privacy_algrthm == _AES_) + if (adapter->securitypriv.dot11_privacy_algrthm == _AES_) ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY & (0x07 << 2)); else ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY & 0x00); @@ -2370,15 +2370,15 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ } /* the function is > passive_level (in critical_section) */ -void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channel) +void rtw_update_ht_cap(struct adapter *adapter, u8 *pie, uint ie_len, u8 channel) { u8 *p, max_ampdu_sz; int len; struct ieee80211_ht_cap *pht_capie; - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct ht_priv *phtpriv = &mlme_priv->htpriv; - struct registry_priv *pregistrypriv = &padapter->registrypriv; - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + struct registry_priv *pregistrypriv = &adapter->registrypriv; + struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; u8 cbw40_enable = 0; @@ -2455,7 +2455,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe pmlmeinfo->HT_protection = pmlmeinfo->HT_info.infos[1] & 0x3; } -void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitframe) +void rtw_issue_addbareq_cmd(struct adapter *adapter, struct xmit_frame *pxmitframe) { u8 issued; int priority; @@ -2464,12 +2464,12 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr struct pkt_attrib *pattrib = &pxmitframe->attrib; s32 bmcst = is_multicast_ether_addr(pattrib->ra); - if (bmcst || (padapter->mlmepriv.link_detect_info.num_tx_ok_in_period < 100)) + if (bmcst || (adapter->mlmepriv.link_detect_info.num_tx_ok_in_period < 100)) return; priority = pattrib->priority; - psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra); + psta = rtw_get_stainfo(&adapter->stapriv, pattrib->ra); if (pattrib->psta != psta) return; @@ -2487,14 +2487,14 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr if (issued == 0) { psta->htpriv.candidate_tid_bitmap |= BIT((u8)priority); - rtw_addbareq_cmd(padapter, (u8) priority, pattrib->ra); + rtw_addbareq_cmd(adapter, (u8) priority, pattrib->ra); } } } -void rtw_append_exented_cap(struct adapter *padapter, u8 *out_ie, uint *pout_len) +void rtw_append_exented_cap(struct adapter *adapter, u8 *out_ie, uint *pout_len) { - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct ht_priv *phtpriv = &mlme_priv->htpriv; u8 cap_content[8] = {0}; @@ -2522,43 +2522,43 @@ inline u8 rtw_to_roam(struct adapter *adapter) return adapter->mlmepriv.to_roam; } -void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network) +void rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network) { - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; spin_lock_bh(&mlme_priv->lock); - _rtw_roaming(padapter, tgt_network); + _rtw_roaming(adapter, tgt_network); spin_unlock_bh(&mlme_priv->lock); } -void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network) +void _rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network) { - struct mlme_priv *mlme_priv = &padapter->mlmepriv; + struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct wlan_network *cur_network = &mlme_priv->cur_network; - if (rtw_to_roam(padapter) > 0) { + if (rtw_to_roam(adapter) > 0) { memcpy(&mlme_priv->assoc_ssid, &cur_network->network.ssid, sizeof(struct ndis_802_11_ssid)); mlme_priv->assoc_by_bssid = false; - while (rtw_do_join(padapter) != _SUCCESS) { - rtw_dec_to_roam(padapter); - if (rtw_to_roam(padapter) <= 0) { - rtw_indicate_disconnect(padapter); + while (rtw_do_join(adapter) != _SUCCESS) { + rtw_dec_to_roam(adapter); + if (rtw_to_roam(adapter) <= 0) { + rtw_indicate_disconnect(adapter); break; } } } } -bool rtw_linked_check(struct adapter *padapter) +bool rtw_linked_check(struct adapter *adapter) { - if (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) || - check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE | WIFI_ADHOC_MASTER_STATE)) { - if (padapter->stapriv.asoc_sta_count > 2) + if (check_fwstate(&adapter->mlmepriv, WIFI_AP_STATE) || + check_fwstate(&adapter->mlmepriv, WIFI_ADHOC_STATE | WIFI_ADHOC_MASTER_STATE)) { + if (adapter->stapriv.asoc_sta_count > 2) return true; } else { /* Station mode */ - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED)) + if (check_fwstate(&adapter->mlmepriv, _FW_LINKED)) return true; } return false; -- cgit v1.2.3 From 403ad340514fc30e6628c3fc296aa96047be0987 Mon Sep 17 00:00:00 2001 From: Dalvin-Ehinoma Noah Aiguobas Date: Fri, 31 Jul 2026 10:41:29 +0000 Subject: staging: rtl8723bs: renaming variable phtpriv in rtw_mlme.c Renaming occurrences of phtpriv to ht_priv since the prefix p is an old naming convention to indicate a pointer variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas Link: https://patch.msgid.link/20260731104134.12754-7-fliegbert2@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 74 +++++++++++++++---------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index e46e137a1adf..7245f671075e 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2154,7 +2154,7 @@ void rtw_joinbss_reset(struct adapter *adapter) u8 threshold; struct mlme_priv *mlme_priv = &adapter->mlmepriv; - struct ht_priv *phtpriv = &mlme_priv->htpriv; + struct ht_priv *ht_priv = &mlme_priv->htpriv; /* todo: if you want to do something io/reg/hw setting before join_bss, please add code here */ @@ -2162,11 +2162,11 @@ void rtw_joinbss_reset(struct adapter *adapter) mlme_priv->num_sta_no_ht = 0; - phtpriv->ampdu_enable = false;/* reset to disabled */ + ht_priv->ampdu_enable = false;/* reset to disabled */ /* TH = 1 => means that invalidate usb rx aggregation */ /* TH = 0 => means that validate usb rx aggregation, use init value. */ - if (phtpriv->ht_option) { + if (ht_priv->ht_option) { if (adapter->registrypriv.wifi_spec == 1) threshold = 1; else @@ -2181,54 +2181,54 @@ void rtw_joinbss_reset(struct adapter *adapter) void rtw_ht_use_default_setting(struct adapter *adapter) { struct mlme_priv *mlme_priv = &adapter->mlmepriv; - struct ht_priv *phtpriv = &mlme_priv->htpriv; + struct ht_priv *ht_priv = &mlme_priv->htpriv; struct registry_priv *pregistrypriv = &adapter->registrypriv; bool bHwLDPCSupport = false, bHwSTBCSupport = false; bool bHwSupportBeamformer = false, bHwSupportBeamformee = false; if (pregistrypriv->wifi_spec) - phtpriv->bss_coexist = 1; + ht_priv->bss_coexist = 1; else - phtpriv->bss_coexist = 0; + ht_priv->bss_coexist = 0; - phtpriv->sgi_40m = TEST_FLAG(pregistrypriv->short_gi, BIT(1)) ? true : false; - phtpriv->sgi_20m = TEST_FLAG(pregistrypriv->short_gi, BIT(0)) ? true : false; + ht_priv->sgi_40m = TEST_FLAG(pregistrypriv->short_gi, BIT(1)) ? true : false; + ht_priv->sgi_20m = TEST_FLAG(pregistrypriv->short_gi, BIT(0)) ? true : false; /* LDPC support */ rtw_hal_get_def_var(adapter, HAL_DEF_RX_LDPC, (u8 *)&bHwLDPCSupport); - CLEAR_FLAGS(phtpriv->ldpc_cap); + CLEAR_FLAGS(ht_priv->ldpc_cap); if (bHwLDPCSupport) { if (TEST_FLAG(pregistrypriv->ldpc_cap, BIT(4))) - SET_FLAG(phtpriv->ldpc_cap, LDPC_HT_ENABLE_RX); + SET_FLAG(ht_priv->ldpc_cap, LDPC_HT_ENABLE_RX); } rtw_hal_get_def_var(adapter, HAL_DEF_TX_LDPC, (u8 *)&bHwLDPCSupport); if (bHwLDPCSupport) { if (TEST_FLAG(pregistrypriv->ldpc_cap, BIT(5))) - SET_FLAG(phtpriv->ldpc_cap, LDPC_HT_ENABLE_TX); + SET_FLAG(ht_priv->ldpc_cap, LDPC_HT_ENABLE_TX); } /* STBC */ rtw_hal_get_def_var(adapter, HAL_DEF_TX_STBC, (u8 *)&bHwSTBCSupport); - CLEAR_FLAGS(phtpriv->stbc_cap); + CLEAR_FLAGS(ht_priv->stbc_cap); if (bHwSTBCSupport) { if (TEST_FLAG(pregistrypriv->stbc_cap, BIT(5))) - SET_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_TX); + SET_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_TX); } rtw_hal_get_def_var(adapter, HAL_DEF_RX_STBC, (u8 *)&bHwSTBCSupport); if (bHwSTBCSupport) { if (TEST_FLAG(pregistrypriv->stbc_cap, BIT(4))) - SET_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_RX); + SET_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_RX); } /* Beamforming setting */ rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&bHwSupportBeamformer); rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&bHwSupportBeamformee); - CLEAR_FLAGS(phtpriv->beamform_cap); + CLEAR_FLAGS(ht_priv->beamform_cap); if (TEST_FLAG(pregistrypriv->beamform_cap, BIT(4)) && bHwSupportBeamformer) - SET_FLAG(phtpriv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); + SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); if (TEST_FLAG(pregistrypriv->beamform_cap, BIT(5)) && bHwSupportBeamformee) - SET_FLAG(phtpriv->beamform_cap, BEAMFORMING_HT_BEAMFORMEE_ENABLE); + SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMEE_ENABLE); } void rtw_build_wmm_ie_ht(struct adapter *adapter, u8 *out_ie, uint *pout_len) @@ -2255,10 +2255,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 *out_i u8 cbw40_enable = 0, stbc_rx_enable = 0, operation_bw = 0; struct registry_priv *pregistrypriv = &adapter->registrypriv; struct mlme_priv *mlme_priv = &adapter->mlmepriv; - struct ht_priv *phtpriv = &mlme_priv->htpriv; + struct ht_priv *ht_priv = &mlme_priv->htpriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; - phtpriv->ht_option = false; + ht_priv->ht_option = false; out_len = *pout_len; @@ -2266,7 +2266,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 *out_i ht_capie.cap_info = cpu_to_le16(IEEE80211_HT_CAP_DSSSCCK40); - if (phtpriv->sgi_20m) + if (ht_priv->sgi_20m) ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_SGI_20); /* Get HT BW */ @@ -2307,17 +2307,17 @@ unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 *out_i if ((cbw40_enable == 1) && (operation_bw == CHANNEL_WIDTH_40)) { ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH); - if (phtpriv->sgi_40m) + if (ht_priv->sgi_40m) ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_SGI_40); } - if (TEST_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_TX)) + if (TEST_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_TX)) ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_TX_STBC); /* todo: disable SM power save mode */ ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_SM_PS); - if (TEST_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_RX)) { + if (TEST_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_RX)) { if ((channel <= 14 && pregistrypriv->rx_stbc == 0x1) || /* enable for 2.4GHz */ (pregistrypriv->wifi_spec == 1)) stbc_rx_enable = 1; @@ -2356,7 +2356,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 *out_i rtw_set_ie(out_ie + out_len, WLAN_EID_HT_CAPABILITY, sizeof(struct ieee80211_ht_cap), (unsigned char *)&ht_capie, pout_len); - phtpriv->ht_option = true; + ht_priv->ht_option = true; if (in_ie) { p = rtw_get_ie(in_ie, WLAN_EID_HT_OPERATION, &ielen, in_len); @@ -2366,7 +2366,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 *out_i } } - return phtpriv->ht_option; + return ht_priv->ht_option; } /* the function is > passive_level (in critical_section) */ @@ -2376,21 +2376,21 @@ void rtw_update_ht_cap(struct adapter *adapter, u8 *pie, uint ie_len, u8 channel int len; struct ieee80211_ht_cap *pht_capie; struct mlme_priv *mlme_priv = &adapter->mlmepriv; - struct ht_priv *phtpriv = &mlme_priv->htpriv; + struct ht_priv *ht_priv = &mlme_priv->htpriv; struct registry_priv *pregistrypriv = &adapter->registrypriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; u8 cbw40_enable = 0; - if (!phtpriv->ht_option) + if (!ht_priv->ht_option) return; if ((!pmlmeinfo->HT_info_enable) || (!pmlmeinfo->HT_caps_enable)) return; /* maybe needs check if ap supports rx ampdu. */ - if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable == 1) - phtpriv->ampdu_enable = true; + if (!(ht_priv->ampdu_enable) && pregistrypriv->ampdu_enable == 1) + ht_priv->ampdu_enable = true; /* check Max Rx A-MPDU Size */ len = 0; @@ -2400,7 +2400,7 @@ void rtw_update_ht_cap(struct adapter *adapter, u8 *pie, uint ie_len, u8 channel max_ampdu_sz = (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR); max_ampdu_sz = 1 << (max_ampdu_sz + 3); /* max_ampdu_sz (kbytes); */ - phtpriv->rx_ampdu_maxlen = max_ampdu_sz; + ht_priv->rx_ampdu_maxlen = max_ampdu_sz; } len = 0; @@ -2460,7 +2460,7 @@ void rtw_issue_addbareq_cmd(struct adapter *adapter, struct xmit_frame *pxmitfra u8 issued; int priority; struct sta_info *psta; - struct ht_priv *phtpriv; + struct ht_priv *ht_priv; struct pkt_attrib *pattrib = &pxmitframe->attrib; s32 bmcst = is_multicast_ether_addr(pattrib->ra); @@ -2479,11 +2479,11 @@ void rtw_issue_addbareq_cmd(struct adapter *adapter, struct xmit_frame *pxmitfra if (!(psta->state & _FW_LINKED)) return; - phtpriv = &psta->htpriv; + ht_priv = &psta->htpriv; - if (phtpriv->ht_option && phtpriv->ampdu_enable) { - issued = (phtpriv->agg_enable_bitmap >> priority) & 0x1; - issued |= (phtpriv->candidate_tid_bitmap >> priority) & 0x1; + if (ht_priv->ht_option && ht_priv->ampdu_enable) { + issued = (ht_priv->agg_enable_bitmap >> priority) & 0x1; + issued |= (ht_priv->candidate_tid_bitmap >> priority) & 0x1; if (issued == 0) { psta->htpriv.candidate_tid_bitmap |= BIT((u8)priority); @@ -2495,10 +2495,10 @@ void rtw_issue_addbareq_cmd(struct adapter *adapter, struct xmit_frame *pxmitfra void rtw_append_exented_cap(struct adapter *adapter, u8 *out_ie, uint *pout_len) { struct mlme_priv *mlme_priv = &adapter->mlmepriv; - struct ht_priv *phtpriv = &mlme_priv->htpriv; + struct ht_priv *ht_priv = &mlme_priv->htpriv; u8 cap_content[8] = {0}; - if (phtpriv->bss_coexist) + if (ht_priv->bss_coexist) SET_EXT_CAPABILITY_ELE_BSS_COEXIST(cap_content, 1); rtw_set_ie(out_ie + *pout_len, WLAN_EID_EXT_CAPABILITY, 8, cap_content, pout_len); -- cgit v1.2.3 From 7e9f6af6ef41a8ca429f1a3ad799d2a0f8d46b90 Mon Sep 17 00:00:00 2001 From: Dalvin-Ehinoma Noah Aiguobas Date: Fri, 31 Jul 2026 10:41:30 +0000 Subject: staging: rtl8723bs: renaming variable pregistrypriv in rtw_mlme.c Renaming occurrences of pregistrypriv to registry_priv since the prefix p is an old naming convention to indicate a pointer variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas Link: https://patch.msgid.link/20260731104134.12754-8-fliegbert2@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 50 +++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 7245f671075e..0da5515a6be5 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2102,14 +2102,14 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u void rtw_init_registrypriv_dev_network(struct adapter *adapter) { - struct registry_priv *pregistrypriv = &adapter->registrypriv; + struct registry_priv *registry_priv = &adapter->registrypriv; struct eeprom_priv *peepriv = &adapter->eeprompriv; - struct wlan_bssid_ex *dev_network = &pregistrypriv->dev_network; + struct wlan_bssid_ex *dev_network = ®istry_priv->dev_network; u8 *myhwaddr = myid(peepriv); memcpy(dev_network->mac_address, myhwaddr, ETH_ALEN); - memcpy(&dev_network->ssid, &pregistrypriv->ssid, sizeof(struct ndis_802_11_ssid)); + memcpy(&dev_network->ssid, ®istry_priv->ssid, sizeof(struct ndis_802_11_ssid)); dev_network->configuration.length = sizeof(struct ndis_802_11_conf); dev_network->configuration.beacon_period = 100; @@ -2118,8 +2118,8 @@ void rtw_init_registrypriv_dev_network(struct adapter *adapter) void rtw_update_registrypriv_dev_network(struct adapter *adapter) { int sz = 0; - struct registry_priv *pregistrypriv = &adapter->registrypriv; - struct wlan_bssid_ex *dev_network = &pregistrypriv->dev_network; + struct registry_priv *registry_priv = &adapter->registrypriv; + struct wlan_bssid_ex *dev_network = ®istry_priv->dev_network; struct security_priv *psecuritypriv = &adapter->securitypriv; struct wlan_network *cur_network = &adapter->mlmepriv.cur_network; @@ -2127,7 +2127,7 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter) dev_network->rssi = 0; - dev_network->configuration.ds_config = (pregistrypriv->channel); + dev_network->configuration.ds_config = (registry_priv->channel); if (cur_network->network.infrastructure_mode == NL80211_IFTYPE_ADHOC) dev_network->configuration.atim_window = (0); @@ -2137,8 +2137,8 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter) /* 1. Supported rates */ /* 2. IE */ - /* rtw_set_supported_rate(dev_network->supported_rates, pregistrypriv->wireless_mode) ; will be called in rtw_generate_ie */ - sz = rtw_generate_ie(pregistrypriv); + /* rtw_set_supported_rate(dev_network->supported_rates, registry_priv->wireless_mode) ; will be called in rtw_generate_ie */ + sz = rtw_generate_ie(registry_priv); dev_network->ie_length = sz; @@ -2182,28 +2182,28 @@ void rtw_ht_use_default_setting(struct adapter *adapter) { struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct ht_priv *ht_priv = &mlme_priv->htpriv; - struct registry_priv *pregistrypriv = &adapter->registrypriv; + struct registry_priv *registry_priv = &adapter->registrypriv; bool bHwLDPCSupport = false, bHwSTBCSupport = false; bool bHwSupportBeamformer = false, bHwSupportBeamformee = false; - if (pregistrypriv->wifi_spec) + if (registry_priv->wifi_spec) ht_priv->bss_coexist = 1; else ht_priv->bss_coexist = 0; - ht_priv->sgi_40m = TEST_FLAG(pregistrypriv->short_gi, BIT(1)) ? true : false; - ht_priv->sgi_20m = TEST_FLAG(pregistrypriv->short_gi, BIT(0)) ? true : false; + ht_priv->sgi_40m = TEST_FLAG(registry_priv->short_gi, BIT(1)) ? true : false; + ht_priv->sgi_20m = TEST_FLAG(registry_priv->short_gi, BIT(0)) ? true : false; /* LDPC support */ rtw_hal_get_def_var(adapter, HAL_DEF_RX_LDPC, (u8 *)&bHwLDPCSupport); CLEAR_FLAGS(ht_priv->ldpc_cap); if (bHwLDPCSupport) { - if (TEST_FLAG(pregistrypriv->ldpc_cap, BIT(4))) + if (TEST_FLAG(registry_priv->ldpc_cap, BIT(4))) SET_FLAG(ht_priv->ldpc_cap, LDPC_HT_ENABLE_RX); } rtw_hal_get_def_var(adapter, HAL_DEF_TX_LDPC, (u8 *)&bHwLDPCSupport); if (bHwLDPCSupport) { - if (TEST_FLAG(pregistrypriv->ldpc_cap, BIT(5))) + if (TEST_FLAG(registry_priv->ldpc_cap, BIT(5))) SET_FLAG(ht_priv->ldpc_cap, LDPC_HT_ENABLE_TX); } @@ -2211,12 +2211,12 @@ void rtw_ht_use_default_setting(struct adapter *adapter) rtw_hal_get_def_var(adapter, HAL_DEF_TX_STBC, (u8 *)&bHwSTBCSupport); CLEAR_FLAGS(ht_priv->stbc_cap); if (bHwSTBCSupport) { - if (TEST_FLAG(pregistrypriv->stbc_cap, BIT(5))) + if (TEST_FLAG(registry_priv->stbc_cap, BIT(5))) SET_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_TX); } rtw_hal_get_def_var(adapter, HAL_DEF_RX_STBC, (u8 *)&bHwSTBCSupport); if (bHwSTBCSupport) { - if (TEST_FLAG(pregistrypriv->stbc_cap, BIT(4))) + if (TEST_FLAG(registry_priv->stbc_cap, BIT(4))) SET_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_RX); } @@ -2224,10 +2224,10 @@ void rtw_ht_use_default_setting(struct adapter *adapter) rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&bHwSupportBeamformer); rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&bHwSupportBeamformee); CLEAR_FLAGS(ht_priv->beamform_cap); - if (TEST_FLAG(pregistrypriv->beamform_cap, BIT(4)) && bHwSupportBeamformer) + if (TEST_FLAG(registry_priv->beamform_cap, BIT(4)) && bHwSupportBeamformer) SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); - if (TEST_FLAG(pregistrypriv->beamform_cap, BIT(5)) && bHwSupportBeamformee) + if (TEST_FLAG(registry_priv->beamform_cap, BIT(5)) && bHwSupportBeamformee) SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMEE_ENABLE); } @@ -2253,7 +2253,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 *out_i unsigned char *p; struct ieee80211_ht_cap ht_capie; u8 cbw40_enable = 0, stbc_rx_enable = 0, operation_bw = 0; - struct registry_priv *pregistrypriv = &adapter->registrypriv; + struct registry_priv *registry_priv = &adapter->registrypriv; struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct ht_priv *ht_priv = &mlme_priv->htpriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; @@ -2302,7 +2302,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 *out_i } /* to disable 40M Hz support while gd_bw_40MHz_en = 0 */ - if ((pregistrypriv->bw_mode & 0x0f) > 0) + if ((registry_priv->bw_mode & 0x0f) > 0) cbw40_enable = 1; if ((cbw40_enable == 1) && (operation_bw == CHANNEL_WIDTH_40)) { @@ -2318,8 +2318,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *adapter, u8 *in_ie, u8 *out_i ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_SM_PS); if (TEST_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_RX)) { - if ((channel <= 14 && pregistrypriv->rx_stbc == 0x1) || /* enable for 2.4GHz */ - (pregistrypriv->wifi_spec == 1)) + if ((channel <= 14 && registry_priv->rx_stbc == 0x1) || /* enable for 2.4GHz */ + (registry_priv->wifi_spec == 1)) stbc_rx_enable = 1; } @@ -2377,7 +2377,7 @@ void rtw_update_ht_cap(struct adapter *adapter, u8 *pie, uint ie_len, u8 channel struct ieee80211_ht_cap *pht_capie; struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct ht_priv *ht_priv = &mlme_priv->htpriv; - struct registry_priv *pregistrypriv = &adapter->registrypriv; + struct registry_priv *registry_priv = &adapter->registrypriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; u8 cbw40_enable = 0; @@ -2389,7 +2389,7 @@ void rtw_update_ht_cap(struct adapter *adapter, u8 *pie, uint ie_len, u8 channel return; /* maybe needs check if ap supports rx ampdu. */ - if (!(ht_priv->ampdu_enable) && pregistrypriv->ampdu_enable == 1) + if (!(ht_priv->ampdu_enable) && registry_priv->ampdu_enable == 1) ht_priv->ampdu_enable = true; /* check Max Rx A-MPDU Size */ @@ -2409,7 +2409,7 @@ void rtw_update_ht_cap(struct adapter *adapter, u8 *pie, uint ie_len, u8 channel /* todo: */ } - if ((pregistrypriv->bw_mode & 0x0f) > 0) + if ((registry_priv->bw_mode & 0x0f) > 0) cbw40_enable = 1; /* update cur_bwmode & cur_ch_offset */ -- cgit v1.2.3 From b2700a102da7f38665ecfb0e2f8e714b26d8d0f2 Mon Sep 17 00:00:00 2001 From: Dalvin-Ehinoma Noah Aiguobas Date: Fri, 31 Jul 2026 10:41:31 +0000 Subject: staging: rtl8723bs: renaming variable bHwLDPCSupport in rtw_mlme.c Renaming occurrences of bHwLDPCSupport to hw_ldpc_support since the prefix b is an old naming convention to indicate a boolean variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas Link: https://patch.msgid.link/20260731104134.12754-9-fliegbert2@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 0da5515a6be5..6a7b86532d81 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2183,7 +2183,7 @@ void rtw_ht_use_default_setting(struct adapter *adapter) struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct ht_priv *ht_priv = &mlme_priv->htpriv; struct registry_priv *registry_priv = &adapter->registrypriv; - bool bHwLDPCSupport = false, bHwSTBCSupport = false; + bool hw_ldpc_support = false, bHwSTBCSupport = false; bool bHwSupportBeamformer = false, bHwSupportBeamformee = false; if (registry_priv->wifi_spec) @@ -2195,14 +2195,14 @@ void rtw_ht_use_default_setting(struct adapter *adapter) ht_priv->sgi_20m = TEST_FLAG(registry_priv->short_gi, BIT(0)) ? true : false; /* LDPC support */ - rtw_hal_get_def_var(adapter, HAL_DEF_RX_LDPC, (u8 *)&bHwLDPCSupport); + rtw_hal_get_def_var(adapter, HAL_DEF_RX_LDPC, (u8 *)&hw_ldpc_support); CLEAR_FLAGS(ht_priv->ldpc_cap); - if (bHwLDPCSupport) { + if (hw_ldpc_support) { if (TEST_FLAG(registry_priv->ldpc_cap, BIT(4))) SET_FLAG(ht_priv->ldpc_cap, LDPC_HT_ENABLE_RX); } - rtw_hal_get_def_var(adapter, HAL_DEF_TX_LDPC, (u8 *)&bHwLDPCSupport); - if (bHwLDPCSupport) { + rtw_hal_get_def_var(adapter, HAL_DEF_TX_LDPC, (u8 *)&hw_ldpc_support); + if (hw_ldpc_support) { if (TEST_FLAG(registry_priv->ldpc_cap, BIT(5))) SET_FLAG(ht_priv->ldpc_cap, LDPC_HT_ENABLE_TX); } -- cgit v1.2.3 From 680711f1f6be5d020acd03dfd6bbb51dabd8153d Mon Sep 17 00:00:00 2001 From: Dalvin-Ehinoma Noah Aiguobas Date: Fri, 31 Jul 2026 10:41:32 +0000 Subject: staging: rtl8723bs: renaming variable bHwSTBCSupport in rtw_mlme.c Renaming occurrences of bHwSTBCSupport to hw_stbc_support since the prefix b is an old naming convention to indicate a boolean variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas Link: https://patch.msgid.link/20260731104134.12754-10-fliegbert2@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 6a7b86532d81..caf8c7623a73 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2183,7 +2183,7 @@ void rtw_ht_use_default_setting(struct adapter *adapter) struct mlme_priv *mlme_priv = &adapter->mlmepriv; struct ht_priv *ht_priv = &mlme_priv->htpriv; struct registry_priv *registry_priv = &adapter->registrypriv; - bool hw_ldpc_support = false, bHwSTBCSupport = false; + bool hw_ldpc_support = false, hw_stbc_support = false; bool bHwSupportBeamformer = false, bHwSupportBeamformee = false; if (registry_priv->wifi_spec) @@ -2208,14 +2208,14 @@ void rtw_ht_use_default_setting(struct adapter *adapter) } /* STBC */ - rtw_hal_get_def_var(adapter, HAL_DEF_TX_STBC, (u8 *)&bHwSTBCSupport); + rtw_hal_get_def_var(adapter, HAL_DEF_TX_STBC, (u8 *)&hw_stbc_support); CLEAR_FLAGS(ht_priv->stbc_cap); - if (bHwSTBCSupport) { + if (hw_stbc_support) { if (TEST_FLAG(registry_priv->stbc_cap, BIT(5))) SET_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_TX); } - rtw_hal_get_def_var(adapter, HAL_DEF_RX_STBC, (u8 *)&bHwSTBCSupport); - if (bHwSTBCSupport) { + rtw_hal_get_def_var(adapter, HAL_DEF_RX_STBC, (u8 *)&hw_stbc_support); + if (hw_stbc_support) { if (TEST_FLAG(registry_priv->stbc_cap, BIT(4))) SET_FLAG(ht_priv->stbc_cap, STBC_HT_ENABLE_RX); } -- cgit v1.2.3 From 2dc4ff4957a2cd4f17edef5da8ab87c70c353409 Mon Sep 17 00:00:00 2001 From: Dalvin-Ehinoma Noah Aiguobas Date: Fri, 31 Jul 2026 10:41:33 +0000 Subject: staging: rtl8723bs: renaming variable bHwSupportBeamformer in rtw_mlme.c Renaming occurrences of bHwSupportBeamformer to hw_support_beamformer since the prefix b is an old naming convention to indicate a boolean variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas Link: https://patch.msgid.link/20260731104134.12754-11-fliegbert2@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index caf8c7623a73..e0dbf420ac62 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2184,7 +2184,7 @@ void rtw_ht_use_default_setting(struct adapter *adapter) struct ht_priv *ht_priv = &mlme_priv->htpriv; struct registry_priv *registry_priv = &adapter->registrypriv; bool hw_ldpc_support = false, hw_stbc_support = false; - bool bHwSupportBeamformer = false, bHwSupportBeamformee = false; + bool hw_support_beamformer = false, bHwSupportBeamformee = false; if (registry_priv->wifi_spec) ht_priv->bss_coexist = 1; @@ -2221,10 +2221,10 @@ void rtw_ht_use_default_setting(struct adapter *adapter) } /* Beamforming setting */ - rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&bHwSupportBeamformer); + rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&hw_support_beamformer); rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&bHwSupportBeamformee); CLEAR_FLAGS(ht_priv->beamform_cap); - if (TEST_FLAG(registry_priv->beamform_cap, BIT(4)) && bHwSupportBeamformer) + if (TEST_FLAG(registry_priv->beamform_cap, BIT(4)) && hw_support_beamformer) SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); if (TEST_FLAG(registry_priv->beamform_cap, BIT(5)) && bHwSupportBeamformee) -- cgit v1.2.3 From 446418344030e7b433b485817cba15a46f7dc13b Mon Sep 17 00:00:00 2001 From: Dalvin-Ehinoma Noah Aiguobas Date: Fri, 31 Jul 2026 10:41:34 +0000 Subject: staging: rtl8723bs: renaming variable bHwSupportBeamformee in rtw_mlme.c Renaming occurrences of bHwSupportBeamformee to hw_support_beamformee since the prefix b is an old naming convention to indicate a boolean variable. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas Link: https://patch.msgid.link/20260731104134.12754-12-fliegbert2@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index e0dbf420ac62..84e479886ffc 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2184,7 +2184,7 @@ void rtw_ht_use_default_setting(struct adapter *adapter) struct ht_priv *ht_priv = &mlme_priv->htpriv; struct registry_priv *registry_priv = &adapter->registrypriv; bool hw_ldpc_support = false, hw_stbc_support = false; - bool hw_support_beamformer = false, bHwSupportBeamformee = false; + bool hw_support_beamformer = false, hw_support_beamformee = false; if (registry_priv->wifi_spec) ht_priv->bss_coexist = 1; @@ -2222,12 +2222,12 @@ void rtw_ht_use_default_setting(struct adapter *adapter) /* Beamforming setting */ rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&hw_support_beamformer); - rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&bHwSupportBeamformee); + rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&hw_support_beamformee); CLEAR_FLAGS(ht_priv->beamform_cap); if (TEST_FLAG(registry_priv->beamform_cap, BIT(4)) && hw_support_beamformer) SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMER_ENABLE); - if (TEST_FLAG(registry_priv->beamform_cap, BIT(5)) && bHwSupportBeamformee) + if (TEST_FLAG(registry_priv->beamform_cap, BIT(5)) && hw_support_beamformee) SET_FLAG(ht_priv->beamform_cap, BEAMFORMING_HT_BEAMFORMEE_ENABLE); } -- cgit v1.2.3 From 3d10487e37fd28477a2e559ed72f6aeb68723f5d Mon Sep 17 00:00:00 2001 From: Mohammed Momin Date: Mon, 3 Aug 2026 20:33:29 +0530 Subject: staging: rtl8723bs: remove unnecessary braces Remove unnecessary braces around a single-statement 'if' block in HalPhyRf.c. This resolves the following checkpatch warning: "WARNING: braces {} are not necessary for single statement blocks" Signed-off-by: Mohammed Momin Link: https://patch.msgid.link/20260803150329.24065-1-linuxmomin0@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/hal/HalPhyRf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf.c b/drivers/staging/rtl8723bs/hal/HalPhyRf.c index bf44c1050be5..449db21e8a0b 100644 --- a/drivers/staging/rtl8723bs/hal/HalPhyRf.c +++ b/drivers/staging/rtl8723bs/hal/HalPhyRf.c @@ -117,9 +117,8 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) } /* Calculate Average ThermalValue after average enough times */ - if (ThermalValue_AVG_count) { + if (ThermalValue_AVG_count) ThermalValue = (u8)(ThermalValue_AVG / ThermalValue_AVG_count); - } /* 4 5. Calculate delta, delta_LCK */ /* delta" here is used to determine whether thermal value changes or not. */ -- cgit v1.2.3 From be86ef1253c9df3ed1e9f93e36c5b00707dab14b Mon Sep 17 00:00:00 2001 From: Ashmit Kumar Date: Mon, 3 Aug 2026 18:15:22 +0000 Subject: staging: rtl8723bs: rtw_ap: remove unnecessary parentheses from return The Linux kernel coding style specifies that return is not a function and therefore parentheses are not required. Signed-off-by: Ashmit Kumar Link: https://patch.msgid.link/20260803181522.3748-1-work.ashmitkumar@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c index 4728f62a1557..9face4c8ded2 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -1068,7 +1068,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) struct __queue *pacl_node_q = &pacl_list->acl_node_q; if ((NUM_ACL - 1) < pacl_list->num) - return (-1); + return -1; spin_lock_bh(&pacl_node_q->lock); -- cgit v1.2.3 From baa84b1bb1648506333fde3e66b6540f9d7d73cc Mon Sep 17 00:00:00 2001 From: Myeonghun Pak Date: Sat, 1 Aug 2026 01:17:10 +0900 Subject: staging: rtl8723bs: disable SDIO function on block size failure sdio_init() enables the SDIO function before configuring the block size. If sdio_set_block_size() fails, the function jumps to the release path and returns the error without disabling the SDIO function. The caller then frees the dvobj directly, so the enabled SDIO function is left active on that probe failure path. Disable the SDIO function before releasing the host when block size configuration fails. This issue was identified during our ongoing static-analysis research while reviewing kernel code. Fixes: 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver") Co-developed-by: Ijae Kim Signed-off-by: Ijae Kim Signed-off-by: Myeonghun Pak Reviewed-by: Dan Carpenter Link: https://patch.msgid.link/20260731161710.44828-1-mhun512@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c index c61d3d12df7f..6ef3a7198533 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -122,8 +122,10 @@ static u32 sdio_init(struct dvobj_priv *dvobj) goto release; err = sdio_set_block_size(func, 512); - if (err) + if (err) { + sdio_disable_func(func); goto release; + } psdio_data->block_transfer_len = 512; psdio_data->tx_block_mode = 1; -- cgit v1.2.3 From 049148af5de057474821a9ff9c434a914a870465 Mon Sep 17 00:00:00 2001 From: Hungyu Lin Date: Fri, 31 Jul 2026 15:52:26 +0000 Subject: staging: rtl8723bs: convert mgmt xmit coalesce to errno Change rtw_mgmt_xmitframe_coalesce() to use kernel-style return values. Return 0 on success and negative errno on failure. The only caller currently doesn't check for errors, so this change does not affect runtime behavior. Later patches in this series will propagate error handling to the caller. Signed-off-by: Hungyu Lin Reviewed-by: Dan Carpenter Link: https://patch.msgid.link/20260731155228.22526-2-dennylin0707@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 8 ++++---- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 81d9e713fc12..eb1aa8f72399 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -1188,7 +1188,7 @@ int rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct } /* broadcast or multicast management pkt use BIP, unicast management pkt use CCMP encryption */ -s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe) +int rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe) { u8 *pframe, *mem_start = NULL, *tmp_buf = NULL; u8 subtype; @@ -1211,7 +1211,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s BIP_AAD = kzalloc(ori_len, GFP_ATOMIC); if (!BIP_AAD) - return _FAIL; + return -ENOMEM; tmp_buf = BIP_AAD; subtype = GetFrameSubType(pframe); /* bit(7)~bit(2) */ @@ -1342,12 +1342,12 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s xmitframe_coalesce_success: spin_unlock_bh(&padapter->security_key_mutex); kfree(BIP_AAD); - return _SUCCESS; + return 0; xmitframe_coalesce_fail: spin_unlock_bh(&padapter->security_key_mutex); kfree(BIP_AAD); - return _FAIL; + return -EINVAL; } /* Logical Link Control(LLC) SubNetwork Attachment Point(SNAP) header diff --git a/drivers/staging/rtl8723bs/include/rtw_xmit.h b/drivers/staging/rtl8723bs/include/rtw_xmit.h index 917e846e9ce2..31decc210e73 100644 --- a/drivers/staging/rtl8723bs/include/rtw_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtw_xmit.h @@ -424,7 +424,7 @@ int rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitfram extern u32 rtw_calculate_wlan_pkt_size_by_attribue(struct pkt_attrib *pattrib); #define rtw_wlan_pkt_size(f) rtw_calculate_wlan_pkt_size_by_attribue(&f->attrib) extern int rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe); -extern s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe); +extern int rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe); s32 _rtw_init_hw_txqueue(struct hw_txqueue *phw_txqueue, u8 ac_tag); void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv); -- cgit v1.2.3 From 64fd99b6feb6bdb542dd80bb055b6ca4688402e4 Mon Sep 17 00:00:00 2001 From: Hungyu Lin Date: Fri, 31 Jul 2026 15:52:27 +0000 Subject: staging: rtl8723bs: propagate errno handling for mgmt xmit Convert rtw_hal_mgnt_xmit() to return errno-style values and update the prototype in hal_intf.h. After this change, dump_mgntframe_and_wait() still uses the return value of rtw_hal_mgnt_xmit() to determine whether it should wait for completion. A follow-on patch will make dump_mgntframe_and_wait() return void since its return value is unused by all current callers. Signed-off-by: Hungyu Lin Reviewed-by: Dan Carpenter Link: https://patch.msgid.link/20260731155228.22526-3-dennylin0707@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++++ drivers/staging/rtl8723bs/hal/hal_intf.c | 9 +++++++-- drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index e965133d94ab..2b1ca1299b96 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -1990,6 +1990,10 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfr pxmitbuf->sctx = &sctx; ret = rtw_hal_mgnt_xmit(padapter, pmgntframe); + if (ret) + ret = _FAIL; + else + ret = _SUCCESS; if (ret == _SUCCESS) ret = rtw_sctx_wait(&sctx); diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c index 2caade1a8bdd..1443875d1369 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -115,8 +115,10 @@ s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe) /* * [IMPORTANT] This function would be run in interrupt context. */ -s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe) +int rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe) { + int ret; + update_mgntframe_attrib_addr(padapter, pmgntframe); /* pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; */ /* pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; */ @@ -130,7 +132,10 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe) pmgntframe->attrib.encrypt = _AES_; pmgntframe->attrib.bswenc = true; } - rtw_mgmt_xmitframe_coalesce(padapter, pmgntframe->pkt, pmgntframe); + ret = rtw_mgmt_xmitframe_coalesce(padapter, pmgntframe->pkt, pmgntframe); + + if (ret) + return ret; } return rtl8723bs_mgnt_xmit(padapter, pmgntframe); diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h index a7ae8c006f0c..7b63116525ca 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -191,7 +191,7 @@ u8 rtw_hal_check_ips_status(struct adapter *padapter); int rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe); s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe); -s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe); +int rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe); s32 rtw_hal_init_xmit_priv(struct adapter *padapter); void rtw_hal_free_xmit_priv(struct adapter *padapter); -- cgit v1.2.3 From 4d2e4968876be984aa5b385143e05c525282a671 Mon Sep 17 00:00:00 2001 From: Hungyu Lin Date: Fri, 31 Jul 2026 15:52:28 +0000 Subject: staging: rtl8723bs: make dump_mgntframe_and_wait() return void The return value of dump_mgntframe_and_wait() is ignored by all current callers. Keep using the return value of rtw_hal_mgnt_xmit() to determine whether to wait for completion. Make dump_mgntframe_and_wait() return void because no caller uses its return value. Suggested-by: Dan Carpenter Signed-off-by: Hungyu Lin Reviewed-by: Dan Carpenter Link: https://patch.msgid.link/20260731155228.22526-4-dennylin0707@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 17 ++++------------- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index 2b1ca1299b96..0c00be09fbf3 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -1971,9 +1971,8 @@ void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe) rtw_hal_mgnt_xmit(padapter, pmgntframe); } -s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms) +void dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms) { - s32 ret = _FAIL; unsigned long irqL; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf; @@ -1983,26 +1982,18 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfr padapter->driver_stopped) { rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf); rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe); - return ret; + return; } rtw_sctx_init(&sctx, timeout_ms); pxmitbuf->sctx = &sctx; - ret = rtw_hal_mgnt_xmit(padapter, pmgntframe); - if (ret) - ret = _FAIL; - else - ret = _SUCCESS; - - if (ret == _SUCCESS) - ret = rtw_sctx_wait(&sctx); + if (!rtw_hal_mgnt_xmit(padapter, pmgntframe)) + rtw_sctx_wait(&sctx); spin_lock_irqsave(&pxmitpriv->lock_sctx, irqL); pxmitbuf->sctx = NULL; spin_unlock_irqrestore(&pxmitpriv->lock_sctx, irqL); - - return ret; } s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmgntframe) diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h index 4b79e56f329a..dad45827d8b9 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -533,7 +533,7 @@ void update_mgnt_tx_rate(struct adapter *padapter, u8 rate); void update_mgntframe_attrib(struct adapter *padapter, struct pkt_attrib *pattrib); void update_mgntframe_attrib_addr(struct adapter *padapter, struct xmit_frame *pmgntframe); void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe); -s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms); +void dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms); s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmgntframe); void issue_beacon(struct adapter *padapter, int timeout_ms); -- cgit v1.2.3 From 42600ab23f7cdfd67a0c371c3d11e6177a93fb3c Mon Sep 17 00:00:00 2001 From: Andrej Dusanic Date: Wed, 5 Aug 2026 12:41:11 +0200 Subject: staging: rtl8723bs: remove duplicate blank line in sdio_ops.h Fix the checkpatch.pl check: "CHECK: Please don't use multiple blank lines" in sdio_ops.h Remove the consecutive blank line to comply with the Linux kernel coding style. Signed-off-by: Andrej Dusanic Link: https://patch.msgid.link/20260805104111.115369-1-dusanic.andrej857@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/include/sdio_ops.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/include/sdio_ops.h b/drivers/staging/rtl8723bs/include/sdio_ops.h index 252b0e1646e5..71a45b989fa5 100644 --- a/drivers/staging/rtl8723bs/include/sdio_ops.h +++ b/drivers/staging/rtl8723bs/include/sdio_ops.h @@ -7,7 +7,6 @@ #ifndef __SDIO_OPS_H__ #define __SDIO_OPS_H__ - #include extern void sdio_set_intf_ops(struct adapter *padapter, struct _io_ops *pops); -- cgit v1.2.3 From 193277cf7cec12ca43ab0d215e1bcb6d5425d487 Mon Sep 17 00:00:00 2001 From: Lucas Jeffrey Date: Sat, 1 Aug 2026 14:36:24 -0300 Subject: staging: axis-fifo: use size_t for write size calculations The write length is provided as size_t, but words_to_write and the return value storage used narrower types (int and unsigned int). Use size_t for the word count and ssize_t for the return value to keep the types consistent with the write interface. This is purely a cleanup. The VFS already bounds the write length before the driver is called, so this does not change runtime behavior. Signed-off-by: Lucas Jeffrey Link: https://patch.msgid.link/20260801173624.106971-1-luquijeffrey@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/axis-fifo/axis-fifo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/axis-fifo/axis-fifo.c b/drivers/staging/axis-fifo/axis-fifo.c index 3d358f919352..7bb35e11d1dd 100644 --- a/drivers/staging/axis-fifo/axis-fifo.c +++ b/drivers/staging/axis-fifo/axis-fifo.c @@ -212,9 +212,9 @@ static ssize_t axis_fifo_write(struct file *f, const char __user *buf, size_t len, loff_t *off) { struct axis_fifo *fifo = f->private_data; - unsigned int words_to_write; + size_t words_to_write; u32 *txbuf; - int ret; + ssize_t ret; words_to_write = len / sizeof(u32); @@ -256,7 +256,7 @@ static ssize_t axis_fifo_write(struct file *f, const char __user *buf, goto end_unlock; } - for (int i = 0; i < words_to_write; ++i) + for (size_t i = 0; i < words_to_write; ++i) iowrite32(txbuf[i], fifo->base_addr + XLLF_TDFD_OFFSET); iowrite32(len, fifo->base_addr + XLLF_TLR_OFFSET); -- cgit v1.2.3 From a4fd75b5fa0e036833fc0654f7b650f31fd3ab5c Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Tue, 4 Aug 2026 08:31:32 -0400 Subject: staging: greybus: fix checkpatch alignment warnings in loopback.c Fix two alignment warnings reported by checkpatch.pl: the wrapped function declaration for gb_loopback_async_transfer_complete(), and the continuation line in the gb_operation_response_alloc() call. Signed-off-by: Pedro Amorim Link: https://patch.msgid.link/20260804123132.24986-1-pedro.aml.dev@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/loopback.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index 2a623fc2e99b..fe48a687377a 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -562,8 +562,7 @@ static int gb_loopback_async_sink(struct gb_loopback *gb, u32 len) return retval; } -static int gb_loopback_async_transfer_complete( - struct gb_loopback_async_operation *op_async) +static int gb_loopback_async_transfer_complete(struct gb_loopback_async_operation *op_async) { struct gb_loopback *gb; struct gb_operation *operation; @@ -653,7 +652,7 @@ static int gb_loopback_request_handler(struct gb_operation *operation) } if (!gb_operation_response_alloc(operation, - len + sizeof(*response), GFP_KERNEL)) { + len + sizeof(*response), GFP_KERNEL)) { dev_err(dev, "error allocating response\n"); return -ENOMEM; } -- cgit v1.2.3 From 4d66d2229ab806ef5782299dfe45af28e78cab25 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolenko Date: Thu, 27 Aug 2026 13:27:07 +0300 Subject: staging: vme_user: Use str_enabled_disabled() helper Replace the hardcoded ternary operator with the str_enabled_disabled() helper function to standardize string formatting. Reported-by: coccicheck Signed-off-by: Svyatoslav Nikolenko Link: https://patch.msgid.link/20260827102707.23965-1-nsvatoslav515@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vme_user/vme_tsi148.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/vme_user/vme_tsi148.c b/drivers/staging/vme_user/vme_tsi148.c index c695ad9b4ca2..9447c00bc013 100644 --- a/drivers/staging/vme_user/vme_tsi148.c +++ b/drivers/staging/vme_user/vme_tsi148.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "vme.h" #include "vme_bridge.h" @@ -2458,7 +2459,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) geoid); dev_info(&pdev->dev, "VME Write and flush and error check is %s\n", - err_chk ? "enabled" : "disabled"); + str_enabled_disabled(err_chk)); retval = tsi148_crcsr_init(tsi148_bridge, pdev); if (retval) { -- cgit v1.2.3 From db57f6517bf65523968ae29cd34a790bfa7d32af Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 20 Aug 2026 14:32:39 +0300 Subject: staging: octeon: schedule the TX cleanup tasklet every 1024th packet cvm_oct_xmit() means to schedule the cleanup tasklet once every 1024 packets, as its comment says, to cover the pathological case of heavy traffic on one port delaying the cleanup of another port blocked waiting for it. The test is inverted: total_to_clean & 0x3ff is true for 1023 of every 1024 values, and false only on the multiples of 1024. So the tasklet is scheduled on nearly every packet, and skipped on exactly the packet the comment wants. That costs one TASKLET softirq per transmitted packet, each walking every port and doing an FAU fetch-and-add per non-empty queue, and it buys nothing for this port, which already frees its completed skbs inline from the skb_to_free value it reads out of the FAU. Test the mask against zero. On a CN50XX board (2 cores at 300MHz) carrying ~6.9k transmitted packets/s, TASKLET softirqs drop from 7133/s to 597/s with no throughput change; the freeing work is conserved, so this removes softirq entries, not work. Fixes: 4898c560103f ("Staging: Octeon: Free transmit SKBs in a timely manner") Signed-off-by: Orgad Shaneh Reviewed-by: Dan Carpenter Link: https://patch.msgid.link/20260820113239.8169-1-orgads@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/octeon/ethernet-tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index cc20c1e6791f..5e536827f87a 100644 --- a/drivers/staging/octeon/ethernet-tx.c +++ b/drivers/staging/octeon/ethernet-tx.c @@ -481,7 +481,7 @@ skip_xmit: cvmx_fau_fetch_and_add32(FAU_TOTAL_TX_TO_CLEAN, 1); } - if (total_to_clean & 0x3ff) { + if ((total_to_clean & 0x3ff) == 0) { /* * Schedule the cleanup tasklet every 1024 packets for * the pathological case of high traffic on one port -- cgit v1.2.3 From d0fc42298aa0822d20039a5a1f93e86edfed1785 Mon Sep 17 00:00:00 2001 From: Nikolay Kulikov Date: Sat, 8 Aug 2026 21:55:17 +0300 Subject: staging: rtl8723bs: remove unused 'pwrdown' from struct hal_com_data This field is used only in the HalDetectPwrDownMode() functions. Replace it with a direct return of a boolean value. Signed-off-by: Nikolay Kulikov Link: https://patch.msgid.link/20260808-rtl8723bs_efuse-v2-1-54488b13d554@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 8 +------- drivers/staging/rtl8723bs/include/hal_data.h | 3 --- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c index 57d2925642e7..b9a7b03e2586 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -544,18 +544,12 @@ static void _RfPowerSave(struct adapter *padapter) static bool HalDetectPwrDownMode(struct adapter *Adapter) { u8 tmpvalue; - struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(Adapter); rtw_efuse_shadow_read(Adapter, 1, 0x7B/*EEPROM_RF_OPT3_92C*/, (u32 *)&tmpvalue); /* 2010/08/25 MH INF priority > PDN Efuse value. */ - if (tmpvalue & BIT(4) && pwrctrlpriv->reg_pdnmode) - pHalData->pwrdown = true; - else - pHalData->pwrdown = false; - - return pHalData->pwrdown; + return (tmpvalue & BIT(4)) && pwrctrlpriv->reg_pdnmode; } /* HalDetectPwrDownMode */ u32 rtl8723bs_hal_init(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/include/hal_data.h b/drivers/staging/rtl8723bs/include/hal_data.h index f67ca496902a..57a18da67fc9 100644 --- a/drivers/staging/rtl8723bs/include/hal_data.h +++ b/drivers/staging/rtl8723bs/include/hal_data.h @@ -234,9 +234,6 @@ struct hal_com_data { u8 u1ForcedIgiLb; /* forced IGI lower bound */ - /* 2010/08/09 MH Add CU power down mode. */ - bool pwrdown; - u8 OutEpQueueSel; u8 OutEpNumber; -- cgit v1.2.3 From f8061b33f6c84593ae7f0fcaead77b759cbbdd05 Mon Sep 17 00:00:00 2001 From: Nikolay Kulikov Date: Sat, 8 Aug 2026 21:55:18 +0300 Subject: staging: rtl8723bs: remove static HalDetectPwrDownMode() function The return value of this function is ignored at the call site, and since the function has no side effects, it can be removed. At the same time, remove the efuse shadow functions, as they are becoming unused. Signed-off-by: Nikolay Kulikov Link: https://patch.msgid.link/20260808-rtl8723bs_efuse-v2-2-54488b13d554@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_efuse.c | 75 --------------------------- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 18 ------- drivers/staging/rtl8723bs/include/rtw_efuse.h | 1 - 3 files changed, 94 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c index 168ecb7a998f..7e215c9845f6 100644 --- a/drivers/staging/rtl8723bs/core/rtw_efuse.c +++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c @@ -145,54 +145,6 @@ static void Efuse_ReadAllMap(struct adapter *padapter, u8 efuseType, u8 *Efuse) Hal_EfusePowerSwitch(padapter, false); } -/*----------------------------------------------------------------------------- - * Function: efuse_ShadowRead1Byte - * efuse_ShadowRead2Byte - * efuse_ShadowRead4Byte - * - * Overview: Read from efuse init map by one/two/four bytes !!!!! - * - * Input: NONE - * - * Output: NONE - * - * Return: NONE - * - * Revised History: - * When Who Remark - * 11/12/2008 MHC Create Version 0. - * - */ -static void efuse_ShadowRead1Byte(struct adapter *padapter, u16 Offset, u8 *Value) -{ - struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); - - *Value = pEEPROM->efuse_eeprom_data[Offset]; - -} /* EFUSE_ShadowRead1Byte */ - -/* Read Two Bytes */ -static void efuse_ShadowRead2Byte(struct adapter *padapter, u16 Offset, u16 *Value) -{ - struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); - - *Value = pEEPROM->efuse_eeprom_data[Offset]; - *Value |= pEEPROM->efuse_eeprom_data[Offset + 1] << 8; - -} /* EFUSE_ShadowRead2Byte */ - -/* Read Four Bytes */ -static void efuse_ShadowRead4Byte(struct adapter *padapter, u16 Offset, u32 *Value) -{ - struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); - - *Value = pEEPROM->efuse_eeprom_data[Offset]; - *Value |= pEEPROM->efuse_eeprom_data[Offset + 1] << 8; - *Value |= pEEPROM->efuse_eeprom_data[Offset + 2] << 16; - *Value |= pEEPROM->efuse_eeprom_data[Offset + 3] << 24; - -} /* efuse_ShadowRead4Byte */ - /*----------------------------------------------------------------------------- * Function: rtw_efuse_shadow_map_update * @@ -224,30 +176,3 @@ void rtw_efuse_shadow_map_update(struct adapter *padapter, u8 efuseType) /* PlatformMoveMemory((void *)&pHalData->EfuseMap[EFUSE_MODIFY_MAP][0], */ /* void *)&pHalData->EfuseMap[EFUSE_INIT_MAP][0], mapLen); */ } /* rtw_efuse_shadow_map_update */ - -/*----------------------------------------------------------------------------- - * Function: rtw_efuse_shadow_read - * - * Overview: Read from efuse init map !!!!! - * - * Input: NONE - * - * Output: NONE - * - * Return: NONE - * - * Revised History: - * When Who Remark - * 11/12/2008 MHC Create Version 0. - * - */ -void rtw_efuse_shadow_read(struct adapter *padapter, u8 Type, u16 Offset, u32 *Value) -{ - if (Type == 1) - efuse_ShadowRead1Byte(padapter, Offset, (u8 *)Value); - else if (Type == 2) - efuse_ShadowRead2Byte(padapter, Offset, (u16 *)Value); - else if (Type == 4) - efuse_ShadowRead4Byte(padapter, Offset, (u32 *)Value); - -} /* rtw_efuse_shadow_read*/ diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c index b9a7b03e2586..001b4b32c02e 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -538,20 +538,6 @@ static void _RfPowerSave(struct adapter *padapter) /* YJ, TODO */ } -/* */ -/* 2010/08/09 MH Add for power down check. */ -/* */ -static bool HalDetectPwrDownMode(struct adapter *Adapter) -{ - u8 tmpvalue; - struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(Adapter); - - rtw_efuse_shadow_read(Adapter, 1, 0x7B/*EEPROM_RF_OPT3_92C*/, (u32 *)&tmpvalue); - - /* 2010/08/25 MH INF priority > PDN Efuse value. */ - return (tmpvalue & BIT(4)) && pwrctrlpriv->reg_pdnmode; -} /* HalDetectPwrDownMode */ - u32 rtl8723bs_hal_init(struct adapter *padapter) { s32 ret; @@ -626,10 +612,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter) if (pwrctrlpriv->reg_rfoff) pwrctrlpriv->rf_pwrstate = rf_off; - /* 2010/08/09 MH We need to check if we need to turnon or off RF after detecting */ - /* HW GPIO pin. Before PHY_RFConfig8192C. */ - HalDetectPwrDownMode(padapter); - /* Save target channel */ /* Current Channel will be updated again later. */ pHalData->CurrentChannel = 6; diff --git a/drivers/staging/rtl8723bs/include/rtw_efuse.h b/drivers/staging/rtl8723bs/include/rtw_efuse.h index 808ba94a5998..a60e05cf699c 100644 --- a/drivers/staging/rtl8723bs/include/rtw_efuse.h +++ b/drivers/staging/rtl8723bs/include/rtw_efuse.h @@ -73,6 +73,5 @@ u8 rtw_efuse_one_byte_read(struct adapter *padapter, u16 addr, u8 *data); u8 rtw_efuse_read_1_byte(struct adapter *padapter, u16 Address); void rtw_efuse_shadow_map_update(struct adapter *padapter, u8 efuseType); -void rtw_efuse_shadow_read(struct adapter *padapter, u8 Type, u16 Offset, u32 *Value); #endif -- cgit v1.2.3 From 8d891d7503dbe9b4a32b1f22159bec77d83390f6 Mon Sep 17 00:00:00 2001 From: Souag-Ahmed-El-fatih Date: Mon, 10 Aug 2026 22:59:33 +0100 Subject: staging: rtl8723bs: fix comparison to true in dequeue_xmitframes_to_sleeping_queue Replace "if (true == ret)" with "if (ret)" as flagged by checkpatch.pl. This follows standard kernel style and avoids the error-prone Yoda-style boolean comparison. Signed-off-by: Souag-Ahmed-El-fatih Link: https://patch.msgid.link/20260810215933.10343-1-souagahmedelfatih@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index eb1aa8f72399..67b273e58278 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -2150,7 +2150,7 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, ret = xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe); - if (true == ret) { + if (ret) { ptxservq = rtw_get_sta_pending(padapter, psta, pattrib->priority, (u8 *)(&ac_index)); ptxservq->qcnt--; -- cgit v1.2.3 From b6de6de139ea50aa2d72139a242d4e399a07ff8f Mon Sep 17 00:00:00 2001 From: Jonggeun Park Date: Tue, 11 Aug 2026 23:23:54 +0900 Subject: staging: rtl8723bs: fix stale file name references in comments Correct two comments whose referenced file names do not match the files currently present in the driver: - include/rtl8723b_hal.h: "rtl8723a_hal_init.c" -> "rtl8723b_hal_init.c" - hal/rtl8723b_rf6052.c: "rtl8192c_rf6052.c" -> "rtl8723b_rf6052.c" No functional change. Signed-off-by: Jonggeun Park Link: https://patch.msgid.link/20260811142355.60533-2-ndamin221@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 2 +- drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c b/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c index fac1270853de..e4f047b14827 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c @@ -7,7 +7,7 @@ /****************************************************************************** * * - * Module: rtl8192c_rf6052.c (Source C File) + * Module: rtl8723b_rf6052.c (Source C File) * * Note: Provide RF 6052 series relative API. * diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h index c442f01aa585..497b1cbc54c8 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h @@ -193,7 +193,7 @@ enum { /* tag_Package_Definition */ PACKAGE_TFBGA79 }; -/* rtl8723a_hal_init.c */ +/* rtl8723b_hal_init.c */ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool bUsedWoWLANFw); void rtl8723b_FirmwareSelfReset(struct adapter *padapter); void rtl8723b_InitializeFirmwareVars(struct adapter *padapter); -- cgit v1.2.3 From 7b20549460061172261bee02731f00c02f0e3b16 Mon Sep 17 00:00:00 2001 From: Preetish Amballi Date: Sun, 9 Aug 2026 11:02:53 +0530 Subject: staging: fbtft: Fix wrong controller name in fb_bd663474 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The file fb_bd663474.c is a driver for the BD663474 LCD controller, but the comment header and MODULE_DESCRIPTION incorrectly reference 'uPD161704' — a copy-paste error from fb_upd161704.c. Fix the comment and MODULE_DESCRIPTION to say 'BD663474' instead of 'uPD161704'. Signed-off-by: Preetish Amballi Reviewed-by: Andy Shevchenko Link: https://patch.msgid.link/20260809053253.14537-1-amballip@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/fbtft/fb_bd663474.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/fbtft/fb_bd663474.c b/drivers/staging/fbtft/fb_bd663474.c index 1629c2c440a9..c34f859043ef 100644 --- a/drivers/staging/fbtft/fb_bd663474.c +++ b/drivers/staging/fbtft/fb_bd663474.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * FB driver for the uPD161704 LCD Controller + * FB driver for the BD663474 LCD Controller * * Copyright (C) 2014 Seong-Woo Kim * @@ -166,6 +166,6 @@ MODULE_ALIAS("platform:" DRVNAME); MODULE_ALIAS("spi:bd663474"); MODULE_ALIAS("platform:bd663474"); -MODULE_DESCRIPTION("FB driver for the uPD161704 LCD Controller"); +MODULE_DESCRIPTION("FB driver for the BD663474 LCD Controller"); MODULE_AUTHOR("Seong-Woo Kim"); MODULE_LICENSE("GPL"); -- cgit v1.2.3 From af6a71fe8af6ae92523013fcf42ff5aa762cc883 Mon Sep 17 00:00:00 2001 From: Leonardo Martins Martins Date: Thu, 13 Aug 2026 21:25:52 -0300 Subject: staging: rtl8723bs: replace N_BYTE_ALIGMENT() with PTR_ALIGN() The macro N_BYTE_ALIGMENT() uses integer division and multiplication to perform byte alignment, with a result equivalent to the standard kernel macro ALIGN() which uses bitwise operations instead. The usages of this macro involve casting the pointer to SIZE_PTR and casting the returned value back, which is the same pattern that PTR_ALIGN() uses, by replacing it with PTR_ALIGN() the manual castings to SIZE_PTR and (u8 *) can be dropped, improving readability. Compile tested only. Signed-off-by: Leonardo Martins Martins Link: https://patch.msgid.link/20260813-staging-testing-v1-1-8baa7c210474@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_recv.c | 3 ++- drivers/staging/rtl8723bs/core/rtw_xmit.c | 13 +++++++------ drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c index 7568fc514d7c..dc6e7ef9857d 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -9,6 +9,7 @@ #include #include #include +#include static u8 SNAP_ETH_TYPE_IPX[2] = {0x81, 0x37}; static u8 SNAP_ETH_TYPE_APPLETALK_AARP[2] = {0x80, 0xf3}; @@ -52,7 +53,7 @@ signed int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *pada goto exit; } - precvpriv->precv_frame_buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(precvpriv->pallocated_frame_buf), RXFRAME_ALIGN_SZ); + precvpriv->precv_frame_buf = PTR_ALIGN(precvpriv->pallocated_frame_buf, RXFRAME_ALIGN_SZ); /* precvpriv->precv_frame_buf = precvpriv->pallocated_frame_buf + RXFRAME_ALIGN_SZ - */ /* ((SIZE_PTR) (precvpriv->pallocated_frame_buf) &(RXFRAME_ALIGN_SZ-1)); */ diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 67b273e58278..a3614cf0b6a2 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -7,6 +7,7 @@ #include #include #include +#include static u8 P802_1H_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0xf8 }; static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 }; @@ -80,7 +81,7 @@ static int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf if (!pxmitbuf->pallocated_buf) return -ENOMEM; - pxmitbuf->pbuf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitbuf->pallocated_buf), XMITBUF_ALIGN_SZ); + pxmitbuf->pbuf = PTR_ALIGN(pxmitbuf->pallocated_buf, XMITBUF_ALIGN_SZ); } return 0; @@ -126,7 +127,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->pxmit_frame_buf = NULL; return -ENOMEM; } - pxmitpriv->pxmit_frame_buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->pallocated_frame_buf), 4); + pxmitpriv->pxmit_frame_buf = PTR_ALIGN(pxmitpriv->pallocated_frame_buf, 4); pxframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf; @@ -162,7 +163,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) if (!pxmitpriv->pallocated_xmitbuf) return -ENOMEM; - pxmitpriv->pxmitbuf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->pallocated_xmitbuf), 4); + pxmitpriv->pxmitbuf = PTR_ALIGN(pxmitpriv->pallocated_xmitbuf, 4); pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf; @@ -207,7 +208,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->xframe_ext = NULL; return -ENOMEM; } - pxmitpriv->xframe_ext = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->xframe_ext_alloc_addr), 4); + pxmitpriv->xframe_ext = PTR_ALIGN(pxmitpriv->xframe_ext_alloc_addr, 4); pxframe = (struct xmit_frame *)pxmitpriv->xframe_ext; for (i = 0; i < NR_XMIT_EXTBUFF; i++) { @@ -239,7 +240,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) if (!pxmitpriv->pallocated_xmit_extbuf) return -ENOMEM; - pxmitpriv->pxmit_extbuf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->pallocated_xmit_extbuf), 4); + pxmitpriv->pxmit_extbuf = PTR_ALIGN(pxmitpriv->pallocated_xmit_extbuf, 4); pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf; @@ -1717,7 +1718,7 @@ struct xmit_frame *rtw_alloc_xmitframe_once(struct xmit_priv *pxmitpriv) if (!alloc_addr) goto exit; - pxframe = (struct xmit_frame *)N_BYTE_ALIGMENT((SIZE_PTR)(alloc_addr), 4); + pxframe = (struct xmit_frame *)PTR_ALIGN(alloc_addr, 4); pxframe->alloc_addr = alloc_addr; pxframe->padapter = pxmitpriv->adapter; diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c index e943c304950e..706d58741dce 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c @@ -7,6 +7,7 @@ #include #include +#include static void initrecvbuf(struct recv_buf *precvbuf, struct adapter *padapter) { @@ -386,7 +387,7 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter) goto exit; } - precvpriv->precv_buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(precvpriv->pallocated_recv_buf), 4); + precvpriv->precv_buf = PTR_ALIGN(precvpriv->pallocated_recv_buf, 4); /* init each recv buffer */ precvbuf = (struct recv_buf *)precvpriv->precv_buf; -- cgit v1.2.3 From 9f50128890e863d0dc5932f1c15adf50216a6fc1 Mon Sep 17 00:00:00 2001 From: Leonardo Martins Martins Date: Thu, 13 Aug 2026 21:25:53 -0300 Subject: staging: rtl8723bs: remove unused macro N_BYTE_ALIGMENT() The macro N_BYTE_ALIGMENT() no longer has any usages and can be removed. Signed-off-by: Leonardo Martins Martins Link: https://patch.msgid.link/20260813-staging-testing-v1-2-8baa7c210474@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/include/basic_types.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/rtl8723bs/include/basic_types.h b/drivers/staging/rtl8723bs/include/basic_types.h index b6b1afaa9ab8..a9924a6fa0e9 100644 --- a/drivers/staging/rtl8723bs/include/basic_types.h +++ b/drivers/staging/rtl8723bs/include/basic_types.h @@ -163,9 +163,6 @@ ); \ } -/* Get the N-bytes alignent offset from the current length */ -#define N_BYTE_ALIGMENT(__Value, __Aligment) ((__Aligment == 1) ? (__Value) : (((__Value + __Aligment - 1) / __Aligment) * __Aligment)) - #define TEST_FLAG(__Flag, __testFlag) (((__Flag) & (__testFlag)) != 0) #define SET_FLAG(__Flag, __setFlag) ((__Flag) |= __setFlag) #define CLEAR_FLAG(__Flag, __clearFlag) ((__Flag) &= ~(__clearFlag)) -- cgit v1.2.3 From 1475ebd298fa9726df86a3ed19e299f62d40e888 Mon Sep 17 00:00:00 2001 From: Nawar Alsafadi Date: Sat, 15 Aug 2026 13:38:03 +0200 Subject: staging: most: video: Remove unnecessary blank line Remove an unnecessary blank line before a close brace '}' to adhere to the Linux kernel coding style. This formatting issue was detected by checkpatch.pl. Signed-off-by: Nawar Alsafadi Link: https://patch.msgid.link/20260815113803.23727-1-nawaralsafadi1@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/most/video/video.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/most/video/video.c b/drivers/staging/most/video/video.c index 88892b5db28b..3a0445ff62f4 100644 --- a/drivers/staging/most/video/video.c +++ b/drivers/staging/most/video/video.c @@ -439,7 +439,6 @@ static int comp_register_videodev(struct most_video_dev *mdev) mdev->vdev->release = video_device_release; return 0; - } static void comp_unregister_videodev(struct most_video_dev *mdev) -- cgit v1.2.3 From 26cbc214d01c5d2c0538f11ad4fae428886d2dd4 Mon Sep 17 00:00:00 2001 From: Hank Yang Date: Mon, 17 Aug 2026 00:28:18 +0800 Subject: staging: rtl8723bs: shorten long lines in update_network() Split long lines to comply with kernel coding style, as flagged by checkpatch.pl: CHECK: line length of 129 exceeds 100 columns (if condition) CHECK: line length of 121 exceeds 100 columns (ss_final calculation) CHECK: line length of 119 exceeds 100 columns (sq_final calculation) Signed-off-by: Hank Yang Link: https://patch.msgid.link/20260816162819.68666-1-s950343@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 84e479886ffc..179061239a6f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -428,8 +428,10 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, rssi_final = rssi_ori; } else { if (sq_smp != 101) { /* from the right channel */ - ss_final = ((u32)(src->phy_info.signal_strength) + (u32)(dst->phy_info.signal_strength) * 4) / 5; - sq_final = ((u32)(src->phy_info.signal_quality) + (u32)(dst->phy_info.signal_quality) * 4) / 5; + ss_final = ((u32)(src->phy_info.signal_strength) + + (u32)(dst->phy_info.signal_strength) * 4) / 5; + sq_final = ((u32)(src->phy_info.signal_quality) + + (u32)(dst->phy_info.signal_quality) * 4) / 5; rssi_final = (src->rssi + dst->rssi * 4) / 5; } else { /* bss info not receiving from the right channel, use the original RX signal infos */ -- cgit v1.2.3 From 7b48d2d81770177dde30081714600664752a019c Mon Sep 17 00:00:00 2001 From: Hungyu Lin Date: Mon, 17 Aug 2026 15:17:11 +0000 Subject: staging: rtl8723bs: simplify rtw_free_xmitframe() rtw_free_xmitframe() always returns _SUCCESS and the return value is not used by its callers. Convert the function to return void and remove the redundant _SUCCESS return value. Also replace the goto used to skip the xmit frame queue handling with an early return. Signed-off-by: Hungyu Lin Link: https://patch.msgid.link/20260817151711.24385-1-dennylin0707@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 14 +++++++------- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index a3614cf0b6a2..68b7be427818 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -1735,14 +1735,14 @@ exit: return pxframe; } -s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe) +void rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe) { struct __queue *queue = NULL; struct adapter *padapter = pxmitpriv->adapter; struct sk_buff *pndis_pkt = NULL; if (!pxmitframe) - return _SUCCESS; + return; if (pxmitframe->pkt) { pndis_pkt = pxmitframe->pkt; @@ -1751,7 +1751,11 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram if (pxmitframe->alloc_addr) { kfree(pxmitframe->alloc_addr); - goto check_pkt_complete; + + if (pndis_pkt) + rtw_os_pkt_complete(padapter, pndis_pkt); + + return; } if (pxmitframe->ext_tag == 0) @@ -1770,12 +1774,8 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram spin_unlock_bh(&queue->lock); -check_pkt_complete: - if (pndis_pkt) rtw_os_pkt_complete(padapter, pndis_pkt); - - return _SUCCESS; } void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframequeue) diff --git a/drivers/staging/rtl8723bs/include/rtw_xmit.h b/drivers/staging/rtl8723bs/include/rtw_xmit.h index 31decc210e73..2d1cc6dd19b9 100644 --- a/drivers/staging/rtl8723bs/include/rtw_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtw_xmit.h @@ -416,7 +416,7 @@ extern s32 rtw_put_snap(u8 *data, u16 h_proto); extern struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv); struct xmit_frame *rtw_alloc_xmitframe_ext(struct xmit_priv *pxmitpriv); struct xmit_frame *rtw_alloc_xmitframe_once(struct xmit_priv *pxmitpriv); -extern s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe); +void rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe); extern void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframequeue); struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, signed int up, u8 *ac); int rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe); -- cgit v1.2.3 From cc4dc2e7cb7869dc189d7ecc038b7940b0850082 Mon Sep 17 00:00:00 2001 From: Dalvin-Ehinoma Noah Aiguobas Date: Mon, 17 Aug 2026 18:16:13 +0000 Subject: staging: rtl8723bs: Removing unnecessary whitespaces Remove unnecessary whitespace to improve readability and coding style consistency. No functional changes are intended in this patch. Signed-off-by: Dalvin-Ehinoma Noah Aiguobas Link: https://patch.msgid.link/20260817181613.9431-1-fliegbert2@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_recv.c | 46 ++++++------- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 12 ++-- drivers/staging/rtl8723bs/include/rtw_recv.h | 69 +++++++++---------- drivers/staging/rtl8723bs/include/sta_info.h | 88 ++++++++++++------------ 4 files changed, 105 insertions(+), 110 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c index dc6e7ef9857d..3c82012fdc6c 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -30,7 +30,7 @@ signed int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *pada { signed int i; union recv_frame *precvframe; - signed int res = _SUCCESS; + signed int res = _SUCCESS; spin_lock_init(&precvpriv->lock); @@ -90,7 +90,7 @@ void _rtw_free_recv_priv(struct recv_priv *precvpriv) { signed int i; union recv_frame *precvframe; - struct adapter *padapter = precvpriv->adapter; + struct adapter *padapter = precvpriv->adapter; rtw_free_uc_swdec_pending_queue(padapter); @@ -112,8 +112,8 @@ void _rtw_free_recv_priv(struct recv_priv *precvpriv) union recv_frame *_rtw_alloc_recvframe(struct __queue *pfree_recv_queue) { - union recv_frame *precvframe; - struct list_head *plist, *phead; + union recv_frame *precvframe; + struct list_head *plist, *phead; struct adapter *padapter; struct recv_priv *precvpriv; @@ -139,7 +139,7 @@ union recv_frame *_rtw_alloc_recvframe(struct __queue *pfree_recv_queue) union recv_frame *rtw_alloc_recvframe(struct __queue *pfree_recv_queue) { - union recv_frame *precvframe; + union recv_frame *precvframe; spin_lock_bh(&pfree_recv_queue->lock); @@ -214,10 +214,10 @@ signed int rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *q * */ -void rtw_free_recvframe_queue(struct __queue *pframequeue, struct __queue *pfree_recv_queue) +void rtw_free_recvframe_queue(struct __queue *pframequeue, struct __queue *pfree_recv_queue) { - union recv_frame *precvframe; - struct list_head *plist, *phead; + union recv_frame *precvframe; + struct list_head *plist, *phead; spin_lock(&pframequeue->lock); @@ -274,7 +274,7 @@ signed int rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue) struct recv_buf *rtw_dequeue_recvbuf(struct __queue *queue) { struct recv_buf *precvbuf; - struct list_head *plist, *phead; + struct list_head *plist, *phead; spin_lock_bh(&queue->lock); @@ -299,7 +299,7 @@ static void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup) { enum nl80211_key_type key_type = 0; union iwreq_data wrqu; - struct iw_michaelmicfailure ev; + struct iw_michaelmicfailure ev; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct security_priv *psecuritypriv = &padapter->securitypriv; unsigned long cur_time = 0; @@ -341,7 +341,7 @@ static void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup) static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe) { - signed int i, res = _SUCCESS; + signed int i, res = _SUCCESS; u32 datalen; u8 miccode[8]; u8 bmic_err = false, brpt_micerror = true; @@ -978,7 +978,7 @@ static signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_ } if ((psta->state & WIFI_SLEEP_STATE) && (pstapriv->sta_dz_bitmap & BIT(psta->aid))) { - struct list_head *xmitframe_plist, *xmitframe_phead; + struct list_head *xmitframe_plist, *xmitframe_phead; struct xmit_frame *pxmitframe = NULL; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; @@ -1046,12 +1046,12 @@ static signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_ static union recv_frame *recvframe_defrag(struct adapter *adapter, struct __queue *defrag_q) { - struct list_head *plist, *phead; - u8 wlanhdr_offset; + struct list_head *plist, *phead; + u8 wlanhdr_offset; u8 curfragnum; struct recv_frame_hdr *pfhdr, *pnfhdr; union recv_frame *prframe, *pnextrframe; - struct __queue *pfree_recv_queue; + struct __queue *pfree_recv_queue; curfragnum = 0; pfree_recv_queue = &adapter->recvpriv.free_recv_queue; @@ -1263,7 +1263,7 @@ static signed int validate_recv_data_frame(struct adapter *adapter, union recv_f u8 *psa, *pda, *pbssid; struct sta_info *psta = NULL; u8 *ptr = precv_frame->u.hdr.rx_data; - struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; + struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; struct security_priv *psecuritypriv = &adapter->securitypriv; signed int ret = _SUCCESS; @@ -1510,13 +1510,13 @@ exit: /* remove the wlanhdr and add the eth_hdr */ static signed int wlanhdr_to_ethhdr(union recv_frame *precvframe) { - signed int rmv_len; + signed int rmv_len; u16 eth_type, len; u8 bsnaphdr; u8 *psnap_type; - struct ieee80211_snap_hdr *psnap; + struct ieee80211_snap_hdr *psnap; __be16 be_tmp; - struct adapter *adapter = precvframe->u.hdr.adapter; + struct adapter *adapter = precvframe->u.hdr.adapter; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; u8 *ptr = precvframe->u.hdr.rx_data; /* point to frame_ctrl field */ struct rx_pkt_attrib *pattrib = &precvframe->u.hdr.attrib; @@ -1524,7 +1524,7 @@ static signed int wlanhdr_to_ethhdr(union recv_frame *precvframe) if (pattrib->encrypt) recvframe_pull_tail(precvframe, pattrib->icv_len); - psnap = (struct ieee80211_snap_hdr *)(ptr + pattrib->hdrlen + pattrib->iv_len); + psnap = (struct ieee80211_snap_hdr *)(ptr + pattrib->hdrlen + pattrib->iv_len); psnap_type = ptr + pattrib->hdrlen + pattrib->iv_len + SNAP_SIZE; /* convert hdr + possible LLC headers into Ethernet header */ /* eth_type = (psnap_type[0] << 8) | psnap_type[1]; */ @@ -1665,7 +1665,7 @@ static void rtw_recv_indicate_pkt(struct adapter *padapter, struct sk_buff *pkt, static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe) { - int a_len, padding_len; + int a_len, padding_len; u16 subframe_len; u8 nr_subframes, i; u8 *pdata; @@ -1845,7 +1845,7 @@ _recv_indicatepkt_drop: static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced) { - struct list_head *phead, *plist; + struct list_head *phead, *plist; union recv_frame *prframe; struct rx_pkt_attrib *pattrib; /* u8 index = 0; */ @@ -1856,7 +1856,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor /* spin_lock_irqsave(&ppending_recvframe_queue->lock, irql); */ /* spin_lock(&ppending_recvframe_queue->lock); */ - phead = get_list_head(ppending_recvframe_queue); + phead = get_list_head(ppending_recvframe_queue); plist = get_next(phead); /* Handling some condition for forced indicate case. */ diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h index dad45827d8b9..a66256f63df7 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -207,22 +207,22 @@ enum { }; struct mlme_handler { - unsigned int num; + unsigned int num; char *str; unsigned int (*func)(struct adapter *padapter, union recv_frame *precv_frame); }; struct action_handler { - unsigned int num; + unsigned int num; char *str; unsigned int (*func)(struct adapter *padapter, union recv_frame *precv_frame); }; struct ss_res { - int state; - int bss_cnt; - int channel_idx; - int scan_mode; + int state; + int bss_cnt; + int channel_idx; + int scan_mode; u8 ssid_num; u8 ch_num; struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT]; diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h index 9c32d480a20a..5c197bd6915f 100644 --- a/drivers/staging/rtl8723bs/include/rtw_recv.h +++ b/drivers/staging/rtl8723bs/include/rtw_recv.h @@ -70,26 +70,26 @@ struct phy_info { u8 rx_pwd_ba11; u8 SignalQuality; /* in 0-100 index. */ - s8 rx_mimo_signal_quality[4]; /* per-path's EVM */ + s8 rx_mimo_signal_quality[4]; /* per-path's EVM */ u8 RxMIMOEVMdbm[4]; /* per-path's EVM dbm */ u8 rx_mimo_signal_strength[4];/* in 0~100 index */ - u16 Cfo_short[4]; /* per-path's Cfo_short */ - u16 Cfo_tail[4]; /* per-path's Cfo_tail */ + u16 Cfo_short[4]; /* per-path's Cfo_short */ + u16 Cfo_tail[4]; /* per-path's Cfo_tail */ - s8 RxPower; /* in dBm Translate from PWdB */ - s8 RecvSignalPower;/* Real power in dBm for this packet, no beautification and aggregation. Keep this raw info to be used for the other procedures. */ + s8 RxPower; /* in dBm Translate from PWdB */ + s8 RecvSignalPower;/* Real power in dBm for this packet, no beautification and aggregation. Keep this raw info to be used for the other procedures. */ u8 bt_rx_rssi_percentage; u8 SignalStrength; /* in 0-100 index. */ - s8 RxPwr[4]; /* per-path's pwdb */ + s8 RxPwr[4]; /* per-path's pwdb */ u8 RxSNR[4]; /* per-path's SNR */ u8 BandWidth; u8 btCoexPwrAdjust; }; -struct rx_pkt_attrib { +struct rx_pkt_attrib { u16 pkt_len; u8 physt; u8 drvinfo_sz; @@ -170,22 +170,22 @@ accesser of recv_priv: rtw_recv_entry(dispatch / passive level); recv_thread(pas using enter_critical section to protect */ struct recv_priv { - spinlock_t lock; - struct __queue free_recv_queue; - struct __queue recv_pending_queue; - struct __queue uc_swdec_pending_queue; + spinlock_t lock; + struct __queue free_recv_queue; + struct __queue recv_pending_queue; + struct __queue uc_swdec_pending_queue; u8 *pallocated_frame_buf; u8 *precv_frame_buf; uint free_recvframe_cnt; - struct adapter *adapter; + struct adapter *adapter; u32 bIsAnyNonBEPkts; - u64 rx_bytes; - u64 rx_pkts; - u64 rx_drop; - uint rx_icv_err; - uint rx_largepacket_crcerr; - uint rx_smallpacket_crcerr; - uint rx_middlepacket_crcerr; + u64 rx_bytes; + u64 rx_pkts; + u64 rx_drop; + uint rx_icv_err; + uint rx_largepacket_crcerr; + uint rx_smallpacket_crcerr; + uint rx_middlepacket_crcerr; struct tasklet_struct irq_prepare_beacon_tasklet; struct tasklet_struct recv_tasklet; @@ -194,10 +194,10 @@ struct recv_priv { u8 *pallocated_recv_buf; u8 *precv_buf; /* 4 alignment */ - struct __queue free_recv_buf_queue; + struct __queue free_recv_buf_queue; u32 free_recv_buf_queue_cnt; - struct __queue recv_buf_pending_queue; + struct __queue recv_buf_pending_queue; /* For display the phy information */ u8 is_signal_dbg; /* for debug */ @@ -212,7 +212,6 @@ struct recv_priv { /* s8 RxRssi[2]; */ /* int FalseAlmCnt_all; */ - struct timer_list signal_stat_timer; u32 signal_stat_sampling_interval; /* u32 signal_stat_converging_constant; */ @@ -224,13 +223,13 @@ struct recv_priv { struct sta_recv_priv { - spinlock_t lock; - signed int option; + spinlock_t lock; + signed int option; /* struct __queue blk_strms[MAX_RX_NUMBLKS]; */ struct __queue defrag_q; /* keeping the fragment frame until defrag */ - struct stainfo_rxcache rxcache; + struct stainfo_rxcache rxcache; /* uint sta_rx_bytes; */ /* uint sta_rx_pkts; */ @@ -238,7 +237,6 @@ struct sta_recv_priv { }; - struct recv_buf { struct list_head list; @@ -257,7 +255,7 @@ struct recv_buf { u8 *ptail; u8 *pend; - struct sk_buff *pskb; + struct sk_buff *pskb; u8 reuse; }; @@ -278,11 +276,11 @@ struct recv_buf { */ struct recv_frame_hdr { - struct list_head list; - struct sk_buff *pkt; - struct sk_buff *pkt_newalloc; + struct list_head list; + struct sk_buff *pkt; + struct sk_buff *pkt_newalloc; - struct adapter *adapter; + struct adapter *adapter; u8 fragcnt; @@ -290,7 +288,7 @@ struct recv_frame_hdr { struct rx_pkt_attrib attrib; - uint len; + uint len; u8 *rx_head; u8 *rx_data; u8 *rx_tail; @@ -306,7 +304,6 @@ struct recv_frame_hdr { struct recv_reorder_ctrl *preorder_ctrl; }; - union recv_frame { union{ struct list_head list; @@ -328,7 +325,7 @@ enum { extern union recv_frame *_rtw_alloc_recvframe(struct __queue *pfree_recv_queue); /* get a free recv_frame from pfree_recv_queue */ extern union recv_frame *rtw_alloc_recvframe(struct __queue *pfree_recv_queue); /* get a free recv_frame from pfree_recv_queue */ -extern int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv_queue); +extern int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv_queue); extern int _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue); extern int rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue); @@ -438,7 +435,7 @@ static inline signed int get_recvframe_len(union recv_frame *precvframe) static inline s32 translate_percentage_to_dbm(u32 SignalStrengthIndex) { - s32 SignalPower; /* in dBm. */ + s32 SignalPower; /* in dBm. */ /* Translate to dBm (x = 0.5y-95). */ SignalPower = (s32)((SignalStrengthIndex + 1) >> 1); @@ -452,6 +449,6 @@ struct sta_info; extern void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv); -extern void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame); +extern void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame); #endif diff --git a/drivers/staging/rtl8723bs/include/sta_info.h b/drivers/staging/rtl8723bs/include/sta_info.h index 0f53e77c110c..bc78c32192c0 100644 --- a/drivers/staging/rtl8723bs/include/sta_info.h +++ b/drivers/staging/rtl8723bs/include/sta_info.h @@ -28,50 +28,50 @@ struct wlan_acl_pool { int mode; int num; struct rtw_wlan_acl_node aclnode[NUM_ACL]; - struct __queue acl_node_q; + struct __queue acl_node_q; }; struct rssi_sta { - s32 UndecoratedSmoothedPWDB; - s32 UndecoratedSmoothedCCK; - s32 UndecoratedSmoothedOFDM; - u64 PacketMap; + s32 UndecoratedSmoothedPWDB; + s32 UndecoratedSmoothedCCK; + s32 UndecoratedSmoothedOFDM; + u64 PacketMap; u8 ValidBit; }; -struct stainfo_stats { +struct stainfo_stats { u64 rx_mgnt_pkts; - u64 rx_beacon_pkts; - u64 rx_probereq_pkts; - u64 rx_probersp_pkts; - u64 rx_probersp_bm_pkts; - u64 rx_probersp_uo_pkts; + u64 rx_beacon_pkts; + u64 rx_probereq_pkts; + u64 rx_probersp_pkts; + u64 rx_probersp_bm_pkts; + u64 rx_probersp_uo_pkts; u64 rx_ctrl_pkts; u64 rx_data_pkts; - u64 last_rx_mgnt_pkts; - u64 last_rx_beacon_pkts; - u64 last_rx_probereq_pkts; - u64 last_rx_probersp_pkts; - u64 last_rx_probersp_bm_pkts; - u64 last_rx_probersp_uo_pkts; - u64 last_rx_ctrl_pkts; - u64 last_rx_data_pkts; - - u64 rx_bytes; - u64 rx_drops; - - u64 tx_pkts; - u64 tx_bytes; - u64 tx_drops; + u64 last_rx_mgnt_pkts; + u64 last_rx_beacon_pkts; + u64 last_rx_probereq_pkts; + u64 last_rx_probersp_pkts; + u64 last_rx_probersp_bm_pkts; + u64 last_rx_probersp_uo_pkts; + u64 last_rx_ctrl_pkts; + u64 last_rx_data_pkts; + + u64 rx_bytes; + u64 rx_drops; + + u64 tx_pkts; + u64 tx_bytes; + u64 tx_drops; }; struct sta_info { - spinlock_t lock; - struct list_head list; /* free_sta_queue */ - struct list_head hash_list; /* sta_hash */ + spinlock_t lock; + struct list_head list; /* free_sta_queue */ + struct list_head hash_list; /* sta_hash */ struct adapter *padapter; struct sta_xmit_priv sta_xmitpriv; @@ -87,19 +87,18 @@ struct sta_info { u8 hwaddr[ETH_ALEN]; bool ieee8021x_blocked; - uint dot118021XPrivacy; /* aes, tkip... */ - union Keytype dot11tkiptxmickey; - union Keytype dot11tkiprxmickey; - union Keytype dot118021x_UncstKey; - union pn48 dot11txpn; /* PN48 used for Unicast xmit */ - union pn48 dot11wtxpn; /* PN48 used for Unicast mgmt xmit. */ - union pn48 dot11rxpn; /* PN48 used for Unicast recv. */ - + uint dot118021XPrivacy; /* aes, tkip... */ + union Keytype dot11tkiptxmickey; + union Keytype dot11tkiprxmickey; + union Keytype dot118021x_UncstKey; + union pn48 dot11txpn; /* PN48 used for Unicast xmit */ + union pn48 dot11wtxpn; /* PN48 used for Unicast mgmt xmit. */ + union pn48 dot11rxpn; /* PN48 used for Unicast recv. */ u8 bssrateset[16]; u32 bssratelen; - s32 rssi; - s32 signal_quality; + s32 rssi; + s32 signal_quality; u8 cts2self; u8 rtsen; @@ -125,7 +124,6 @@ struct sta_info { /* unsigned char ampdu_txen_bitmap; */ u16 BA_starting_seqctrl[16]; - struct ht_priv htpriv; /* Notes: */ @@ -186,7 +184,7 @@ struct sta_info { u32 assoc_req_len; /* for DM */ - struct rssi_sta rssi_stat; + struct rssi_sta rssi_stat; /* ODM_STA_INFO_T */ /* ================ODM Relative Info ======================= */ @@ -254,14 +252,14 @@ struct sta_info { #define STA_PKTS_FMT "(m:%llu, c:%llu, d:%llu)" -struct sta_priv { +struct sta_priv { u8 *pallocated_stainfo_buf; u8 *pstainfo_buf; - struct __queue free_sta_queue; + struct __queue free_sta_queue; spinlock_t sta_hash_lock; - struct list_head sta_hash[NUM_STA]; + struct list_head sta_hash[NUM_STA]; int asoc_sta_count; struct __queue sleep_q; struct __queue wakeup_q; @@ -319,7 +317,7 @@ extern u32 _rtw_free_sta_priv(struct sta_priv *pstapriv); int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *sta); struct sta_info *rtw_get_stainfo_by_offset(struct sta_priv *stapriv, int offset); -extern struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr); +extern struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr); extern u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta); extern void rtw_free_all_stainfo(struct adapter *padapter); extern struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr); -- cgit v1.2.3 From 778a0bf8c2c0d329beb929f5c2e7f6bc17ea4b01 Mon Sep 17 00:00:00 2001 From: Malathi A Date: Tue, 18 Aug 2026 09:55:34 +0000 Subject: staging: rtl8723bs: remove unused NDIS_802_11 typedefs The 'NDIS_802_11_RATES' and 'NDIS_802_11_PMKID_VALUE' types have no users anywhere in the tree, only their typedef declarations remain. Remove both, together with the 'NDIS_802_11_LENGTH_RATES' definition whose only user was the 'NDIS_802_11_RATES' typedef. This addresses part of the "convert any remaining unusual variable types" entry in the driver TODO. Signed-off-by: Malathi A Link: https://patch.msgid.link/20260818095535.1230025-1-malathi.a2000@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 2 -- drivers/staging/rtl8723bs/include/wlan_bssdef.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h index 768e4868ecfd..020b143f36be 100644 --- a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h +++ b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h @@ -7,8 +7,6 @@ #ifndef __RTW_IOCTL_SET_H_ #define __RTW_IOCTL_SET_H_ -typedef u8 NDIS_802_11_PMKID_VALUE[16]; - u8 rtw_set_802_11_authentication_mode(struct adapter *pdapter, enum ndis_802_11_authentication_mode authmode); u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep); u8 rtw_set_802_11_disassociate(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/staging/rtl8723bs/include/wlan_bssdef.h index f4c1456f1476..ff2cee2f3b99 100644 --- a/drivers/staging/rtl8723bs/include/wlan_bssdef.h +++ b/drivers/staging/rtl8723bs/include/wlan_bssdef.h @@ -12,10 +12,8 @@ #define NDIS_802_11_LENGTH_SSID 32 -#define NDIS_802_11_LENGTH_RATES 8 #define NDIS_802_11_LENGTH_RATES_EX 16 -typedef unsigned char NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; /* Set of 8 data rates */ typedef unsigned char NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; /* Set of 16 data rates */ struct ndis_802_11_ssid { -- cgit v1.2.3 From c71186e538b76e55ef40dd13822385af8b1485b4 Mon Sep 17 00:00:00 2001 From: Malathi A Date: Tue, 18 Aug 2026 09:55:35 +0000 Subject: staging: rtl8723bs: remove unusual 'NDIS_802_11_RATES_EX' type Remove the 'NDIS_802_11_RATES_EX' type and replace the variables of this type with an array of 'u8', which makes the code more understandable and gets rid of an unnecessary 'typedef'. 'u8' and the 'unsigned char' the typedef expanded to are the same type and the array length is unchanged, so there is no functional change. Also update the comment in wlan_bssdef.h that referred to the removed type. Signed-off-by: Malathi A Link: https://patch.msgid.link/20260818095535.1230025-2-malathi.a2000@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- drivers/staging/rtl8723bs/include/wlan_bssdef.h | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h index a66256f63df7..40f55bfa8810 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -253,7 +253,7 @@ struct FW_Sta_Info { u32 status; u32 rx_pkt; u32 retry; - NDIS_802_11_RATES_EX SupportedRates; + u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX]; }; /* diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/staging/rtl8723bs/include/wlan_bssdef.h index ff2cee2f3b99..9137057726ef 100644 --- a/drivers/staging/rtl8723bs/include/wlan_bssdef.h +++ b/drivers/staging/rtl8723bs/include/wlan_bssdef.h @@ -14,8 +14,6 @@ #define NDIS_802_11_LENGTH_SSID 32 #define NDIS_802_11_LENGTH_RATES_EX 16 -typedef unsigned char NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; /* Set of 16 data rates */ - struct ndis_802_11_ssid { u32 ssid_length; u8 ssid[32]; @@ -48,7 +46,7 @@ struct ndis_80211_var_ie { * ETH_ALEN + 2 + * sizeof (struct ndis_802_11_ssid) + sizeof (u32) + * sizeof (long) + - * sizeof (struct ndis_802_11_conf) + sizeof (NDIS_802_11_RATES_EX) + ie_length + * sizeof (struct ndis_802_11_conf) + NDIS_802_11_LENGTH_RATES_EX + ie_length * * Except for ie_length, all other fields are fixed length. Therefore, we can * define a macro to present the partial sum. @@ -140,7 +138,7 @@ struct wlan_bssid_ex { long rssi;/* in dBM, raw data , get from PHY) */ struct ndis_802_11_conf configuration; enum nl80211_iftype infrastructure_mode; - NDIS_802_11_RATES_EX supported_rates; + u8 supported_rates[NDIS_802_11_LENGTH_RATES_EX]; struct wlan_phy_info phy_info; u32 ie_length; u8 ies[MAX_IE_SZ]; /* timestamp, beacon interval, and capability information) */ -- cgit v1.2.3 From 3278529bb8ddbfaa4eeaea5602ff29d8499b4b2b Mon Sep 17 00:00:00 2001 From: Dhanush Muralidharan Date: Wed, 19 Aug 2026 20:56:12 +0530 Subject: staging: rtl8723bs: remove extern from function declarations in header files Function declarations in header files are implicitly extern. Remove the redundant extern keyword to clean up the code. Signed-off-by: Dhanush Muralidharan Link: https://patch.msgid.link/20260819152612.41350-1-dhanushmuralidharan@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/include/cmd_osdep.h | 6 +- drivers/staging/rtl8723bs/include/osdep_service.h | 4 +- .../rtl8723bs/include/osdep_service_linux.h | 2 +- drivers/staging/rtl8723bs/include/rtw_cmd.h | 58 ++++++++-------- drivers/staging/rtl8723bs/include/rtw_io.h | 14 ++-- drivers/staging/rtl8723bs/include/rtw_mlme.h | 78 +++++++++++----------- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 18 ++--- drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 22 +++--- drivers/staging/rtl8723bs/include/sdio_ops.h | 20 +++--- drivers/staging/rtl8723bs/include/xmit_osdep.h | 14 ++-- 10 files changed, 118 insertions(+), 118 deletions(-) diff --git a/drivers/staging/rtl8723bs/include/cmd_osdep.h b/drivers/staging/rtl8723bs/include/cmd_osdep.h index 91d933d71945..a7b526a658a9 100644 --- a/drivers/staging/rtl8723bs/include/cmd_osdep.h +++ b/drivers/staging/rtl8723bs/include/cmd_osdep.h @@ -9,8 +9,8 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv); int rtw_init_evt_priv(struct evt_priv *pevtpriv); -extern void _rtw_free_evt_priv(struct evt_priv *pevtpriv); -extern void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv); -extern struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue); +void _rtw_free_evt_priv(struct evt_priv *pevtpriv); +void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv); +struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue); #endif diff --git a/drivers/staging/rtl8723bs/include/osdep_service.h b/drivers/staging/rtl8723bs/include/osdep_service.h index 2f5011a8210c..e2eebd46cb5c 100644 --- a/drivers/staging/rtl8723bs/include/osdep_service.h +++ b/drivers/staging/rtl8723bs/include/osdep_service.h @@ -15,7 +15,7 @@ #include -extern int RTW_STATUS_CODE(int error_code); +int RTW_STATUS_CODE(int error_code); int _rtw_netif_rx(struct net_device *ndev, struct sk_buff *skb); @@ -29,7 +29,7 @@ static inline void flush_signals_thread(void) #define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r)) -extern void rtw_free_netdev(struct net_device *netdev); +void rtw_free_netdev(struct net_device *netdev); /* Macros for handling unaligned memory accesses */ diff --git a/drivers/staging/rtl8723bs/include/osdep_service_linux.h b/drivers/staging/rtl8723bs/include/osdep_service_linux.h index c8274da940ff..cc5eaf6a2c61 100644 --- a/drivers/staging/rtl8723bs/include/osdep_service_linux.h +++ b/drivers/staging/rtl8723bs/include/osdep_service_linux.h @@ -113,6 +113,6 @@ static inline struct adapter *rtw_netdev_priv(struct net_device *netdev) } struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv, void *old_priv); -extern struct net_device *rtw_alloc_etherdev(int sizeof_priv); +struct net_device *rtw_alloc_etherdev(int sizeof_priv); #endif diff --git a/drivers/staging/rtl8723bs/include/rtw_cmd.h b/drivers/staging/rtl8723bs/include/rtw_cmd.h index 2e791da7e815..58a5ec39ce76 100644 --- a/drivers/staging/rtl8723bs/include/rtw_cmd.h +++ b/drivers/staging/rtl8723bs/include/rtw_cmd.h @@ -107,16 +107,16 @@ struct c2h_evt_hdr_88xx { #define c2h_evt_valid(c2h_evt) ((c2h_evt)->id || (c2h_evt)->plen) int rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj); -extern struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv); -extern void rtw_free_cmd_obj(struct cmd_obj *pcmd); +struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv); +void rtw_free_cmd_obj(struct cmd_obj *pcmd); void rtw_stop_cmd_thread(struct adapter *adapter); int rtw_cmd_thread(void *context); -extern void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv); +void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv); -extern void rtw_free_evt_priv(struct evt_priv *pevtpriv); -extern void rtw_evt_notify_isr(struct evt_priv *pevtpriv); +void rtw_free_evt_priv(struct evt_priv *pevtpriv); +void rtw_evt_notify_isr(struct evt_priv *pevtpriv); enum { NONE_WK_CID, @@ -573,50 +573,50 @@ Result: #define H2C_RESERVED 0x07 u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, int ssid_num, struct rtw_ieee80211_channel *ch, int ch_num); -extern u8 rtw_createbss_cmd(struct adapter *padapter); +u8 rtw_createbss_cmd(struct adapter *padapter); int rtw_startbss_cmd(struct adapter *padapter, int flags); struct sta_info; -extern u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_key, bool enqueue); -extern u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueue); +u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_key, bool enqueue); +u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueue); -extern u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork); +u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork); u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueue); -extern u8 rtw_setopmode_cmd(struct adapter *padapter, enum nl80211_iftype networktype, bool enqueue); -extern u8 rtw_setrfintfs_cmd(struct adapter *padapter, u8 mode); +u8 rtw_setopmode_cmd(struct adapter *padapter, enum nl80211_iftype networktype, bool enqueue); +u8 rtw_setrfintfs_cmd(struct adapter *padapter, u8 mode); -extern u8 rtw_gettssi_cmd(struct adapter *padapter, u8 offset, u8 *pval); -extern u8 rtw_setfwdig_cmd(struct adapter *padapter, u8 type); -extern u8 rtw_setfwra_cmd(struct adapter *padapter, u8 type); +u8 rtw_gettssi_cmd(struct adapter *padapter, u8 offset, u8 *pval); +u8 rtw_setfwdig_cmd(struct adapter *padapter, u8 type); +u8 rtw_setfwra_cmd(struct adapter *padapter, u8 type); -extern u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr); -extern u8 rtw_reset_securitypriv_cmd(struct adapter *padapter); -extern u8 rtw_free_assoc_resources_cmd(struct adapter *padapter); -extern u8 rtw_dynamic_chk_wk_cmd(struct adapter *adapter); +u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr); +u8 rtw_reset_securitypriv_cmd(struct adapter *padapter); +u8 rtw_free_assoc_resources_cmd(struct adapter *padapter); +u8 rtw_dynamic_chk_wk_cmd(struct adapter *adapter); u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue); u8 rtw_dm_in_lps_wk_cmd(struct adapter *padapter); u8 rtw_dm_ra_mask_wk_cmd(struct adapter *padapter, u8 *psta); -extern u8 rtw_ps_cmd(struct adapter *padapter); +u8 rtw_ps_cmd(struct adapter *padapter); u8 rtw_chk_hi_queue_cmd(struct adapter *padapter); -extern u8 rtw_c2h_packet_wk_cmd(struct adapter *padapter, u8 *pbuf, u16 length); -extern u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt); +u8 rtw_c2h_packet_wk_cmd(struct adapter *padapter, u8 *pbuf, u16 length); +u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt); u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf); -extern void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_getbbrfreg_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_getbbrfreg_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_getrttbl_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_getrttbl_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); struct _cmd_callback { diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/rtl8723bs/include/rtw_io.h index 3c99a2bc19bd..55bedd912993 100644 --- a/drivers/staging/rtl8723bs/include/rtw_io.h +++ b/drivers/staging/rtl8723bs/include/rtw_io.h @@ -43,15 +43,15 @@ struct io_priv { }; -extern u8 rtw_read8(struct adapter *adapter, u32 addr); -extern u16 rtw_read16(struct adapter *adapter, u32 addr); -extern u32 rtw_read32(struct adapter *adapter, u32 addr); +u8 rtw_read8(struct adapter *adapter, u32 addr); +u16 rtw_read16(struct adapter *adapter, u32 addr); +u32 rtw_read32(struct adapter *adapter, u32 addr); -extern int rtw_write8(struct adapter *adapter, u32 addr, u8 val); -extern int rtw_write16(struct adapter *adapter, u32 addr, u16 val); -extern int rtw_write32(struct adapter *adapter, u32 addr, u32 val); +int rtw_write8(struct adapter *adapter, u32 addr, u8 val); +int rtw_write16(struct adapter *adapter, u32 addr, u16 val); +int rtw_write32(struct adapter *adapter, u32 addr, u32 val); -extern u32 rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); +u32 rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); int rtw_init_io_priv(struct adapter *padapter, void (*set_intf_ops)(struct adapter *padapter, struct _io_ops *pops)); diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h index 6faa13535b62..7709d5fd77a3 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -249,32 +249,32 @@ struct hostapd_priv { struct adapter *padapter; }; -extern int hostapd_mode_init(struct adapter *padapter); -extern void hostapd_mode_unload(struct adapter *padapter); +int hostapd_mode_init(struct adapter *padapter); +void hostapd_mode_unload(struct adapter *padapter); -extern void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf); -extern void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_cpwm_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf); +void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf); +void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf); +void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf); +void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf); +void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf); +void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf); +void rtw_cpwm_event_callback(struct adapter *adapter, u8 *pbuf); +void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf); -extern void rtw_join_timeout_handler(struct timer_list *t); -extern void _rtw_scan_timeout_handler(struct timer_list *t); +void rtw_join_timeout_handler(struct timer_list *t); +void _rtw_scan_timeout_handler(struct timer_list *t); int event_thread(void *context); -extern void rtw_free_network_queue(struct adapter *adapter, u8 isfreeall); -extern int rtw_init_mlme_priv(struct adapter *adapter);/* (struct mlme_priv *pmlmepriv); */ +void rtw_free_network_queue(struct adapter *adapter, u8 isfreeall); +int rtw_init_mlme_priv(struct adapter *adapter);/* (struct mlme_priv *pmlmepriv); */ -extern void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); +void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); -extern signed int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv); -extern signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, signed int keyid, u8 set_tx, bool enqueue); -extern signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv); +signed int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv); +signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, signed int keyid, u8 set_tx, bool enqueue); +signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv); static inline u8 *get_bssid(struct mlme_priv *pmlmepriv) { /* if sta_mode:pmlmepriv->cur_network.network.mac_address => bssid */ @@ -318,48 +318,48 @@ static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, signed int state) pmlmepriv->bScanInProcess = false; } -extern u16 rtw_get_capability(struct wlan_bssid_ex *bss); -extern void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target); -extern void rtw_disconnect_hdl_under_linked(struct adapter *adapter, struct sta_info *psta, u8 free_assoc); -extern void rtw_generate_random_ibss(u8 *pibss); -extern struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr); -extern struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue); +u16 rtw_get_capability(struct wlan_bssid_ex *bss); +void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target); +void rtw_disconnect_hdl_under_linked(struct adapter *adapter, struct sta_info *psta, u8 free_assoc); +void rtw_generate_random_ibss(u8 *pibss); +struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr); +struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue); struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue, struct wlan_network *network); -extern void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue); -extern void rtw_indicate_disconnect(struct adapter *adapter); -extern void rtw_indicate_connect(struct adapter *adapter); +void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue); +void rtw_indicate_disconnect(struct adapter *adapter); +void rtw_indicate_connect(struct adapter *adapter); void rtw_indicate_scan_done(struct adapter *padapter, bool aborted); void rtw_scan_abort(struct adapter *adapter); -extern int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len); -extern int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len); -extern void rtw_init_registrypriv_dev_network(struct adapter *adapter); +int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len); +int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len); +void rtw_init_registrypriv_dev_network(struct adapter *adapter); -extern void rtw_update_registrypriv_dev_network(struct adapter *adapter); +void rtw_update_registrypriv_dev_network(struct adapter *adapter); -extern void _rtw_join_timeout_handler(struct timer_list *t); -extern void rtw_scan_timeout_handler(struct timer_list *t); +void _rtw_join_timeout_handler(struct timer_list *t); +void rtw_scan_timeout_handler(struct timer_list *t); -extern void rtw_dynamic_check_timer_handler(struct adapter *adapter); +void rtw_dynamic_check_timer_handler(struct adapter *adapter); bool rtw_is_scan_deny(struct adapter *adapter); void rtw_clear_scan_deny(struct adapter *adapter); void rtw_set_scan_deny(struct adapter *adapter, u32 ms); void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); -extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); +void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); /* extern struct wlan_network* _rtw_dequeue_network(struct __queue *queue); */ -extern struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv); +struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv); -extern void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall); -extern void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork); +void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall); +void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork); -extern struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr); +struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr); bool rtw_if_up(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h index 40f55bfa8810..70fb161afd09 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -422,7 +422,7 @@ void init_mlme_default_rate_set(struct adapter *padapter); void init_mlme_ext_priv(struct adapter *padapter); void init_hw_mlme_ext(struct adapter *padapter); void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext); -extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv); +struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv); /* void fill_fwpriv(struct adapter *padapter, struct fw_priv *pfwpriv); */ @@ -516,8 +516,8 @@ s16 rtw_camid_search(struct adapter *adapter, u8 *addr, s16 kid); s16 rtw_camid_alloc(struct adapter *adapter, struct sta_info *sta, u8 kid); void rtw_camid_free(struct adapter *adapter, u8 cam_id); -extern void rtw_alloc_macid(struct adapter *padapter, struct sta_info *psta); -extern void rtw_release_macid(struct adapter *padapter, struct sta_info *psta); +void rtw_alloc_macid(struct adapter *padapter, struct sta_info *psta); +void rtw_release_macid(struct adapter *padapter, struct sta_info *psta); void report_join_res(struct adapter *padapter, int res); void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame); @@ -527,7 +527,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int void report_wmm_edca_update(struct adapter *padapter); u8 chk_bmc_sleepq_cmd(struct adapter *padapter); -extern u8 set_tx_beacon_cmd(struct adapter *padapter); +u8 set_tx_beacon_cmd(struct adapter *padapter); unsigned int setup_beacon_frame(struct adapter *padapter, unsigned char *beacon_frame); void update_mgnt_tx_rate(struct adapter *padapter, u8 rate); void update_mgntframe_attrib(struct adapter *padapter, struct pkt_attrib *pattrib); @@ -606,12 +606,12 @@ void sa_query_timer_hdl(struct timer_list *t); _set_timer(&(mlmeext)->sa_query_timer, (ms)); \ } while (0) -extern void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr); +void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr); -extern void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len); -extern void correct_TSF(struct adapter *padapter, struct mlme_ext_priv *pmlmeext); -extern void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len); -extern bool traffic_status_watchdog(struct adapter *padapter, bool from_timer); +void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len); +void correct_TSF(struct adapter *padapter, struct mlme_ext_priv *pmlmeext); +void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len); +bool traffic_status_watchdog(struct adapter *padapter, bool from_timer); int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset); diff --git a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h index 182b8c88ccc8..49f19b6ee329 100644 --- a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h +++ b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h @@ -212,20 +212,20 @@ struct pwrctrl_priv { _set_timer(&(pwrctl)->pwr_state_check_timer, (ms)); \ } while (0) -extern void rtw_init_pwrctrl_priv(struct adapter *adapter); -extern void rtw_free_pwrctrl_priv(struct adapter *adapter); +void rtw_init_pwrctrl_priv(struct adapter *adapter); +void rtw_free_pwrctrl_priv(struct adapter *adapter); s32 rtw_register_task_alive(struct adapter *adapter, u32 task); void rtw_unregister_task_alive(struct adapter *adapter, u32 task); -extern s32 rtw_register_tx_alive(struct adapter *padapter); -extern void rtw_unregister_tx_alive(struct adapter *padapter); -extern s32 rtw_register_cmd_alive(struct adapter *padapter); -extern void rtw_unregister_cmd_alive(struct adapter *padapter); -extern void cpwm_int_hdl(struct adapter *padapter, struct reportpwrstate_parm *preportpwrstate); -extern void LPS_Leave_check(struct adapter *padapter); - -extern void LeaveAllPowerSaveMode(struct adapter *Adapter); -extern void LeaveAllPowerSaveModeDirect(struct adapter *Adapter); +s32 rtw_register_tx_alive(struct adapter *padapter); +void rtw_unregister_tx_alive(struct adapter *padapter); +s32 rtw_register_cmd_alive(struct adapter *padapter); +void rtw_unregister_cmd_alive(struct adapter *padapter); +void cpwm_int_hdl(struct adapter *padapter, struct reportpwrstate_parm *preportpwrstate); +void LPS_Leave_check(struct adapter *padapter); + +void LeaveAllPowerSaveMode(struct adapter *Adapter); +void LeaveAllPowerSaveModeDirect(struct adapter *Adapter); void _ips_enter(struct adapter *padapter); void ips_enter(struct adapter *padapter); int _ips_leave(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/sdio_ops.h b/drivers/staging/rtl8723bs/include/sdio_ops.h index 71a45b989fa5..f939263495df 100644 --- a/drivers/staging/rtl8723bs/include/sdio_ops.h +++ b/drivers/staging/rtl8723bs/include/sdio_ops.h @@ -9,24 +9,24 @@ #include -extern void sdio_set_intf_ops(struct adapter *padapter, struct _io_ops *pops); +void sdio_set_intf_ops(struct adapter *padapter, struct _io_ops *pops); /* extern void sdio_func1cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem); */ /* extern void sdio_func1cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem); */ -extern u8 SdioLocalCmd52Read1Byte(struct adapter *padapter, u32 addr); -extern void SdioLocalCmd52Write1Byte(struct adapter *padapter, u32 addr, u8 v); -extern s32 sdio_local_read(struct adapter *padapter, u32 addr, u32 cnt, u8 *pbuf); -extern s32 sdio_local_write(struct adapter *padapter, u32 addr, u32 cnt, u8 *pbuf); +u8 SdioLocalCmd52Read1Byte(struct adapter *padapter, u32 addr); +void SdioLocalCmd52Write1Byte(struct adapter *padapter, u32 addr, u8 v); +s32 sdio_local_read(struct adapter *padapter, u32 addr, u32 cnt, u8 *pbuf); +s32 sdio_local_write(struct adapter *padapter, u32 addr, u32 cnt, u8 *pbuf); u32 _sdio_read32(struct adapter *padapter, u32 addr); s32 _sdio_write32(struct adapter *padapter, u32 addr, u32 val); -extern void sd_int_hdl(struct adapter *padapter); -extern u8 CheckIPSStatus(struct adapter *padapter); +void sd_int_hdl(struct adapter *padapter); +u8 CheckIPSStatus(struct adapter *padapter); -extern void InitInterrupt8723BSdio(struct adapter *padapter); +void InitInterrupt8723BSdio(struct adapter *padapter); void rtw_sdio_enable_interrupt(struct adapter *padapter); void rtw_sdio_disable_interrupt(struct adapter *padapter); -extern u8 HalQueryTxBufferStatus8723BSdio(struct adapter *padapter); -extern void HalQueryTxOQTBufferStatus8723BSdio(struct adapter *padapter); +u8 HalQueryTxBufferStatus8723BSdio(struct adapter *padapter); +void HalQueryTxOQTBufferStatus8723BSdio(struct adapter *padapter); #endif /* !__SDIO_OPS_H__ */ diff --git a/drivers/staging/rtl8723bs/include/xmit_osdep.h b/drivers/staging/rtl8723bs/include/xmit_osdep.h index ee6616880d41..85c42fa06dbd 100644 --- a/drivers/staging/rtl8723bs/include/xmit_osdep.h +++ b/drivers/staging/rtl8723bs/include/xmit_osdep.h @@ -25,19 +25,19 @@ struct sta_xmit_priv; struct xmit_frame; struct xmit_buf; -extern void _rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); -extern netdev_tx_t rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); +void _rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); +netdev_tx_t rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); void rtw_os_xmit_schedule(struct adapter *padapter); void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 free_sz, u8 flag); -extern unsigned int rtw_remainder_len(struct pkt_file *pfile); -extern void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile); +unsigned int rtw_remainder_len(struct pkt_file *pfile); +void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile); int _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, unsigned int rlen); -extern signed int rtw_endofpktfile(struct pkt_file *pfile); +signed int rtw_endofpktfile(struct pkt_file *pfile); -extern void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt); -extern void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe); +void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt); +void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe); #endif /* __XMIT_OSDEP_H_ */ -- cgit v1.2.3 From 754bbe68712f7eac5df54982fa4f5c09ea581f38 Mon Sep 17 00:00:00 2001 From: Tiago Panizio Gottardo Date: Fri, 21 Aug 2026 11:53:39 -0300 Subject: staging: rtl8723bs: use bool for PMKSA flags The inserted and matched variables only track boolean state in the PMKSA helpers. Use bool instead of u8 and give the variables clearer names. No functional changes intended. Signed-off-by: Tiago Panizio Gottardo Link: https://patch.msgid.link/CPYP284MB0854D9AB7B360D108DFC7116FFA32@CPYP284MB0854.BRAP284.PROD.OUTLOOK.COM Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c index 3468d4114f60..f7396dbb5d3c 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -1830,27 +1830,26 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_pmksa *pmksa) { - u8 index, blInserted = false; + bool inserted = false; + u8 index; struct adapter *padapter = rtw_netdev_priv(ndev); struct security_priv *psecuritypriv = &padapter->securitypriv; if (is_zero_ether_addr((u8 *)pmksa->bssid)) return -EINVAL; - blInserted = false; - /* overwrite PMKID */ for (index = 0 ; index < NUM_PMKID_CACHE; index++) { if (!memcmp(psecuritypriv->PMKIDList[index].Bssid, (u8 *)pmksa->bssid, ETH_ALEN)) { memcpy(psecuritypriv->PMKIDList[index].PMKID, (u8 *)pmksa->pmkid, WLAN_PMKID_LEN); psecuritypriv->PMKIDList[index].bUsed = true; psecuritypriv->PMKIDIndex = index + 1; - blInserted = true; + inserted = true; break; } } - if (!blInserted) { + if (!inserted) { memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, (u8 *)pmksa->bssid, ETH_ALEN); memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].PMKID, (u8 *)pmksa->pmkid, WLAN_PMKID_LEN); @@ -1867,7 +1866,8 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_pmksa *pmksa) { - u8 index, bMatched = false; + bool matched = false; + u8 index; struct adapter *padapter = rtw_netdev_priv(ndev); struct security_priv *psecuritypriv = &padapter->securitypriv; @@ -1880,12 +1880,12 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy, eth_zero_addr(psecuritypriv->PMKIDList[index].Bssid); memset(psecuritypriv->PMKIDList[index].PMKID, 0x00, WLAN_PMKID_LEN); psecuritypriv->PMKIDList[index].bUsed = false; - bMatched = true; + matched = true; break; } } - if (!bMatched) + if (!matched) return -EINVAL; return 0; -- cgit v1.2.3 From 427c477e8e557d155f6a58638b2edd881a9a7d83 Mon Sep 17 00:00:00 2001 From: Hungyu Lin Date: Tue, 25 Aug 2026 12:54:05 +0000 Subject: staging: rtl8723bs: make rtw_free_xmitbuf_ext() return void The return value of rtw_free_xmitbuf_ext() is never checked. Change its return type to void and remove the redundant _SUCCESS and _FAIL return values. Also remove the unnecessary extern keyword from its declaration. Signed-off-by: Hungyu Lin Link: https://patch.msgid.link/20260825125406.1710-2-dennylin0707@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 6 ++---- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 68b7be427818..1364936d5f29 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -1535,13 +1535,13 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv) return pxmitbuf; } -s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) +void rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) { unsigned long irqL; struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue; if (!pxmitbuf) - return _FAIL; + return; spin_lock_irqsave(&pfree_queue->lock, irqL); @@ -1551,8 +1551,6 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) pxmitpriv->free_xmit_extbuf_cnt++; spin_unlock_irqrestore(&pfree_queue->lock, irqL); - - return _SUCCESS; } struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv) diff --git a/drivers/staging/rtl8723bs/include/rtw_xmit.h b/drivers/staging/rtl8723bs/include/rtw_xmit.h index 2d1cc6dd19b9..6df4b1834e1c 100644 --- a/drivers/staging/rtl8723bs/include/rtw_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtw_xmit.h @@ -403,7 +403,7 @@ extern struct xmit_frame *__rtw_alloc_cmdxmitframe(struct xmit_priv *pxmitpriv, #define rtw_alloc_bcnxmitframe(p) __rtw_alloc_cmdxmitframe(p, CMDBUF_BEACON) extern struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv); -extern s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); +void rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); extern struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv); extern s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); -- cgit v1.2.3 From 2d09104a22ae34ca70ec5fc5ab6409b71ef55ae9 Mon Sep 17 00:00:00 2001 From: Hungyu Lin Date: Tue, 25 Aug 2026 12:54:06 +0000 Subject: staging: rtl8723bs: make rtw_free_xmitbuf() return void The return value of rtw_free_xmitbuf() is never checked. Change its return type to void and remove the redundant _SUCCESS and _FAIL return values. Also remove the unnecessary extern keyword from its declaration. Signed-off-by: Hungyu Lin Link: https://patch.msgid.link/20260825125406.1710-3-dennylin0707@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 5 ++--- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 1364936d5f29..95350fd6a94f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -1594,13 +1594,13 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv) return pxmitbuf; } -s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) +void rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) { unsigned long irqL; struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue; if (!pxmitbuf) - return _FAIL; + return; if (pxmitbuf->sctx) rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_FREE); @@ -1619,7 +1619,6 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) pxmitpriv->free_xmitbuf_cnt++; spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, irqL); } - return _SUCCESS; } static void rtw_init_xmitframe(struct xmit_frame *pxframe) diff --git a/drivers/staging/rtl8723bs/include/rtw_xmit.h b/drivers/staging/rtl8723bs/include/rtw_xmit.h index 6df4b1834e1c..873807fcd0dd 100644 --- a/drivers/staging/rtl8723bs/include/rtw_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtw_xmit.h @@ -406,7 +406,7 @@ extern struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv); void rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); extern struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv); -extern s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); +void rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, int sz); extern void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len); -- cgit v1.2.3 From d685d1dfaf0270e98011a0c5d2547c9988e587ea Mon Sep 17 00:00:00 2001 From: Romeu Gomes Date: Fri, 28 Aug 2026 11:17:01 +0100 Subject: staging: rtl8723bs: remove unnecessary parentheses in ioctl_cfg80211.c Remove unnecessary parentheses around the right-hand side of assignments and around function arguments. This clears up all "Unnecessary parentheses" warnings reported by checkpatch.pl. Signed-off-by: Romeu Gomes Link: https://patch.msgid.link/20260828101701.18750-1-asm.artisan256@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 70 +++++++++++------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c index f7396dbb5d3c..4416d0ec1db9 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -216,7 +216,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl struct wireless_dev *wdev = padapter->rtw_wdev; struct wiphy *wiphy = wdev->wiphy; - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + struct mlme_priv *pmlmepriv = &padapter->mlmepriv; bssinf_len = pnetwork->network.ie_length + sizeof(struct ieee80211_hdr_3addr); if (bssinf_len > MAX_BSSINFO_LEN) @@ -281,7 +281,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl pbuf = buf; pwlanhdr = (struct ieee80211_hdr *)pbuf; - fctrl = &(pwlanhdr->frame_control); + fctrl = &pwlanhdr->frame_control; *(fctrl) = 0; SetSeqNum(pwlanhdr, 0/*pmlmeext->mgnt_seq*/); @@ -291,7 +291,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl eth_broadcast_addr(pwlanhdr->addr1); SetFrameSubType(pbuf, WIFI_BEACON); } else { - memcpy(pwlanhdr->addr1, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr1, myid(&padapter->eeprompriv), ETH_ALEN); SetFrameSubType(pbuf, WIFI_PROBERSP); } @@ -328,7 +328,7 @@ exit: */ int rtw_cfg80211_check_bss(struct adapter *padapter) { - struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network); + struct wlan_bssid_ex *pnetwork = &padapter->mlmeextpriv.mlmext_info.network; struct cfg80211_bss *bss = NULL; struct ieee80211_channel *notify_channel = NULL; u32 freq; @@ -352,7 +352,7 @@ int rtw_cfg80211_check_bss(struct adapter *padapter) void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct wlan_network *cur_network = &(pmlmepriv->cur_network); + struct wlan_network *cur_network = &pmlmepriv->cur_network; struct wireless_dev *pwdev = padapter->rtw_wdev; struct wiphy *wiphy = pwdev->wiphy; int freq = (int)cur_network->network.configuration.ds_config; @@ -362,7 +362,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) return; if (!rtw_cfg80211_check_bss(padapter)) { - struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network); + struct wlan_bssid_ex *pnetwork = &padapter->mlmeextpriv.mlmext_info.network; struct wlan_network *scanned = pmlmepriv->cur_network_scanned; if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) { @@ -394,7 +394,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) void rtw_cfg80211_indicate_connect(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct wlan_network *cur_network = &(pmlmepriv->cur_network); + struct wlan_network *cur_network = &pmlmepriv->cur_network; struct wireless_dev *pwdev = padapter->rtw_wdev; if (pwdev->iftype != NL80211_IFTYPE_STATION @@ -407,7 +407,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter) return; { - struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network); + struct wlan_bssid_ex *pnetwork = &padapter->mlmeextpriv.mlmext_info.network; struct wlan_network *scanned = pmlmepriv->cur_network_scanned; if (!scanned) { @@ -493,7 +493,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa struct sta_info *psta = NULL, *pbcmc_sta = NULL; struct adapter *padapter = rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct security_priv *psecuritypriv = &(padapter->securitypriv); + struct security_priv *psecuritypriv = &padapter->securitypriv; struct sta_priv *pstapriv = &padapter->stapriv; char *grpkey = padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey; char *txkey = padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey; @@ -552,7 +552,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx; } - memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), param->u.crypt.key, wep_key_len); + memcpy(&psecuritypriv->dot11DefKey[wep_key_idx].skey[0], param->u.crypt.key, wep_key_len); psecuritypriv->dot11DefKeylen[wep_key_idx] = wep_key_len; @@ -578,8 +578,8 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa memcpy(grpkey, param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len)); /* set mic key */ - memcpy(txkey, &(param->u.crypt.key[16]), 8); - memcpy(rxkey, &(param->u.crypt.key[24]), 8); + memcpy(txkey, ¶m->u.crypt.key[16], 8); + memcpy(rxkey, ¶m->u.crypt.key[24], 8); psecuritypriv->busetkipkey = true; @@ -622,8 +622,8 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psta->dot118021XPrivacy = _TKIP_; /* set mic key */ - memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); - memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); + memcpy(psta->dot11tkiptxmickey.skey, ¶m->u.crypt.key[16], 8); + memcpy(psta->dot11tkiprxmickey.skey, ¶m->u.crypt.key[24], 8); psecuritypriv->busetkipkey = true; @@ -652,8 +652,8 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa memcpy(grpkey, param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len)); /* set mic key */ - memcpy(txkey, &(param->u.crypt.key[16]), 8); - memcpy(rxkey, &(param->u.crypt.key[24]), 8); + memcpy(txkey, ¶m->u.crypt.key[16], 8); + memcpy(rxkey, ¶m->u.crypt.key[24], 8); psecuritypriv->busetkipkey = true; @@ -748,7 +748,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx; } - memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), param->u.crypt.key, wep_key_len); + memcpy(&psecuritypriv->dot11DefKey[wep_key_idx].skey[0], param->u.crypt.key, wep_key_len); psecuritypriv->dot11DefKeylen[wep_key_idx] = wep_key_len; @@ -778,8 +778,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len)); if (strcmp(param->u.crypt.alg, "TKIP") == 0) { /* set mic key */ - memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); - memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); + memcpy(psta->dot11tkiptxmickey.skey, ¶m->u.crypt.key[16], 8); + memcpy(psta->dot11tkiprxmickey.skey, ¶m->u.crypt.key[24], 8); padapter->securitypriv.busetkipkey = false; /* _set_timer(&padapter->securitypriv.tkip_timer, 50); */ @@ -789,8 +789,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param } else { /* group key */ if (strcmp(param->u.crypt.alg, "TKIP") == 0 || strcmp(param->u.crypt.alg, "CCMP") == 0) { memcpy(padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len)); - memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); - memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); + memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey, ¶m->u.crypt.key[16], 8); + memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey, ¶m->u.crypt.key[24], 8); padapter->securitypriv.binstallGrpkey = true; padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx; @@ -981,7 +981,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy, /* for infra./P2PClient mode */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED)) { - struct wlan_network *cur_network = &(pmlmepriv->cur_network); + struct wlan_network *cur_network = &pmlmepriv->cur_network; if (memcmp((u8 *)mac, cur_network->network.mac_address, ETH_ALEN)) { ret = -ENOENT; @@ -1022,7 +1022,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy, enum nl80211_iftype old_type; struct adapter *padapter = rtw_netdev_priv(ndev); struct wireless_dev *rtw_wdev = padapter->rtw_wdev; - struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); + struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; int ret = 0; if (adapter_to_dvobj(padapter)->processing_dev_remove) { @@ -1111,11 +1111,11 @@ void rtw_cfg80211_unlink_bss(struct adapter *padapter, struct wlan_network *pnet void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter) { struct list_head *plist, *phead; - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - struct __queue *queue = &(pmlmepriv->scanned_queue); + struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + struct __queue *queue = &pmlmepriv->scanned_queue; struct wlan_network *pnetwork = NULL; - spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_lock_bh(&pmlmepriv->scanned_queue.lock); phead = get_list_head(queue); list_for_each(plist, phead) @@ -1124,13 +1124,13 @@ void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter) /* report network only if the current channel set contains the channel to which this network belongs */ if (rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.configuration.ds_config) >= 0 - && true == rtw_validate_ssid(&(pnetwork->network.ssid))) { + && true == rtw_validate_ssid(&pnetwork->network.ssid)) { /* ev =translate_scan(padapter, a, pnetwork, ev, stop); */ rtw_cfg80211_inform_bss(padapter, pnetwork); } } - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); } static int rtw_cfg80211_set_probe_req_wpsp2pie(struct adapter *padapter, char *buf, int len) @@ -1138,7 +1138,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct adapter *padapter, char *b int ret = 0; unsigned int wps_ielen = 0; u8 *wps_ie; - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + struct mlme_priv *pmlmepriv = &padapter->mlmepriv; if (len > 0) { wps_ie = rtw_get_wps_ie(buf, len, NULL, &wps_ielen); @@ -2058,8 +2058,8 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc /* u8 category, action, OUI_Subtype, dialogToken = 0; */ /* unsigned char *frame_body; */ struct ieee80211_hdr *pwlanhdr; - struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); - struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); + struct xmit_priv *pxmitpriv = &padapter->xmitpriv; + struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; u8 *buf = skb->data; u32 len = skb->len; u8 category, action; @@ -2244,7 +2244,7 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_l int ret = 0; u8 *pbuf = NULL; unsigned int len, wps_ielen = 0; - struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); + struct mlme_priv *pmlmepriv = &adapter->mlmepriv; if (!check_fwstate(pmlmepriv, WIFI_AP_STATE)) return -EINVAL; @@ -2336,7 +2336,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, u8 updated = false; struct sta_info *psta = NULL; struct adapter *padapter = rtw_netdev_priv(wdev->netdev); - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct sta_priv *pstapriv = &padapter->stapriv; const u8 *mac = params->mac; @@ -2461,8 +2461,8 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *b int ret = _FAIL; bool __maybe_unused ack = true; struct ieee80211_hdr *pwlanhdr; - struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); - struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); + struct xmit_priv *pxmitpriv = &padapter->xmitpriv; + struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; rtw_set_scan_deny(padapter, 1000); -- cgit v1.2.3 From bb2b72ecf863484ea2242225e2e1b89795efa1ad Mon Sep 17 00:00:00 2001 From: Mirza Ishan Beg Date: Sat, 29 Aug 2026 21:18:38 +0530 Subject: staging: rtl8723bs: refactor traffic_stat access in collect_traffic_statistics Replace repetitive `pdvobjpriv->traffic_stat.` dereferencing with a local pointer `ts` to improve readability and reduce line length. This resolves multiple checkpatch line-length warnings without manual wrapping. Suggested-by: Nikolay Kulikov Signed-off-by: Mirza Ishan Beg Link: https://lore.kernel.org/linux-staging/agDaGJ5UKndFUNPY@archlinux/ Link: https://patch.msgid.link/20260829154838.4533-1-seedandsyntax@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c index ce3dfa1fee26..59f13f6b85ad 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -1109,25 +1109,26 @@ exit: static void collect_traffic_statistics(struct adapter *padapter) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); + struct rtw_traffic_statistics *ts = &pdvobjpriv->traffic_stat; /* Tx */ - pdvobjpriv->traffic_stat.tx_bytes = padapter->xmitpriv.tx_bytes; - pdvobjpriv->traffic_stat.tx_pkts = padapter->xmitpriv.tx_pkts; - pdvobjpriv->traffic_stat.tx_drop = padapter->xmitpriv.tx_drop; + ts->tx_bytes = padapter->xmitpriv.tx_bytes; + ts->tx_pkts = padapter->xmitpriv.tx_pkts; + ts->tx_drop = padapter->xmitpriv.tx_drop; /* Rx */ - pdvobjpriv->traffic_stat.rx_bytes = padapter->recvpriv.rx_bytes; - pdvobjpriv->traffic_stat.rx_pkts = padapter->recvpriv.rx_pkts; - pdvobjpriv->traffic_stat.rx_drop = padapter->recvpriv.rx_drop; + ts->rx_bytes = padapter->recvpriv.rx_bytes; + ts->rx_pkts = padapter->recvpriv.rx_pkts; + ts->rx_drop = padapter->recvpriv.rx_drop; /* Calculate throughput in last interval */ - pdvobjpriv->traffic_stat.cur_tx_bytes = pdvobjpriv->traffic_stat.tx_bytes - pdvobjpriv->traffic_stat.last_tx_bytes; - pdvobjpriv->traffic_stat.cur_rx_bytes = pdvobjpriv->traffic_stat.rx_bytes - pdvobjpriv->traffic_stat.last_rx_bytes; - pdvobjpriv->traffic_stat.last_tx_bytes = pdvobjpriv->traffic_stat.tx_bytes; - pdvobjpriv->traffic_stat.last_rx_bytes = pdvobjpriv->traffic_stat.rx_bytes; + ts->cur_tx_bytes = ts->tx_bytes - ts->last_tx_bytes; + ts->cur_rx_bytes = ts->rx_bytes - ts->last_rx_bytes; + ts->last_tx_bytes = ts->tx_bytes; + ts->last_rx_bytes = ts->rx_bytes; - pdvobjpriv->traffic_stat.cur_tx_tp = (u32)(pdvobjpriv->traffic_stat.cur_tx_bytes * 8 / 2 / 1024 / 1024); - pdvobjpriv->traffic_stat.cur_rx_tp = (u32)(pdvobjpriv->traffic_stat.cur_rx_bytes * 8 / 2 / 1024 / 1024); + ts->cur_tx_tp = (u32)(ts->cur_tx_bytes * 8 / 2 / 1024 / 1024); + ts->cur_rx_tp = (u32)(ts->cur_rx_bytes * 8 / 2 / 1024 / 1024); } bool traffic_status_watchdog(struct adapter *padapter, bool from_timer) -- cgit v1.2.3 From bb7638662f1c39bcfba9790d72ed23054c7b713a Mon Sep 17 00:00:00 2001 From: Adriano Cordova Date: Sun, 30 Aug 2026 22:05:56 -0400 Subject: staging: rtl8723bs: remove dead beamforming code The beamforming declarations are guarded by #if (BEAMFORMING_SUPPORT == 1) but BEAMFORMING_SUPPORT is defined to 0, so they are never compiled. The types they use (RT_BEAMFORMING_INFO, BEAMFORMING_CAP, PMGNT_INFO) are not defined anywhere either. Remove the dead declarations and the now unused macro. Signed-off-by: Adriano Cordova Link: https://patch.msgid.link/20260831020557.1235504-2-adrianox@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/hal/odm.h | 8 -------- drivers/staging/rtl8723bs/hal/odm_precomp.h | 1 - 2 files changed, 9 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h index a20b48660e63..d29eaba41dcb 100644 --- a/drivers/staging/rtl8723bs/hal/odm.h +++ b/drivers/staging/rtl8723bs/hal/odm.h @@ -936,10 +936,6 @@ struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */ struct timer_list FastAntTrainingTimer; /* ODM relative workitem. */ - - #if (BEAMFORMING_SUPPORT == 1) - RT_BEAMFORMING_INFO BeamformingInfo; - #endif }; enum ODM_BB_Config_Type { @@ -1068,10 +1064,6 @@ u32 ODM_Get_Rate_Bitmap( u8 rssi_level ); -#if (BEAMFORMING_SUPPORT == 1) -BEAMFORMING_CAP Beamforming_GetEntryBeamCapByMacId(PMGNT_INFO pMgntInfo, u8 MacId); -#endif - void odm_TXPowerTrackingInit(struct dm_odm_t *pDM_Odm); void ODM_DMInit(struct dm_odm_t *pDM_Odm); diff --git a/drivers/staging/rtl8723bs/hal/odm_precomp.h b/drivers/staging/rtl8723bs/hal/odm_precomp.h index 2987857a8761..d4390fd203f1 100644 --- a/drivers/staging/rtl8723bs/hal/odm_precomp.h +++ b/drivers/staging/rtl8723bs/hal/odm_precomp.h @@ -19,7 +19,6 @@ /* include */ /* include */ /* include */ -#define BEAMFORMING_SUPPORT 0 /* 2 Hardware Parameter Files */ -- cgit v1.2.3 From 17aead0e02891270c6c45cab9fbb7bded274c16a Mon Sep 17 00:00:00 2001 From: Adriano Cordova Date: Sun, 30 Aug 2026 22:05:57 -0400 Subject: staging: rtl8723bs: remove unused chip-type enums and defines Remove enums and defines left over from other Realtek chips: - the RF_8225, RF_8256, RF_8258, RF_6052 and RF_PSEUDO_11N RF-type enum - TX_2S, TX_3S and TX_4S - RF_PATH_MAX_92C_88E and RF_PATH_MAX_90_8812 - TX_POWER_NEAR_FIELD_THRESH_8812 - ODM_ITRF_ALL None of them is referenced anywhere in the driver. Signed-off-by: Adriano Cordova Link: https://patch.msgid.link/20260831020557.1235504-3-adrianox@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/hal/odm.h | 1 - drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h | 1 - drivers/staging/rtl8723bs/include/hal_phy.h | 16 ---------------- 3 files changed, 18 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h index d29eaba41dcb..b123df98fa22 100644 --- a/drivers/staging/rtl8723bs/hal/odm.h +++ b/drivers/staging/rtl8723bs/hal/odm.h @@ -382,7 +382,6 @@ enum { /* _ODM_Support_Ability_Definition */ /* ODM_CMNINFO_INTERFACE */ enum { /* tag_ODM_Support_Interface_Definition */ ODM_ITRF_SDIO = 0x4, - ODM_ITRF_ALL = 0x7, }; /* ODM_CMNINFO_IC_TYPE */ diff --git a/drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h b/drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h index e2d244324ebe..4431a3ddf175 100644 --- a/drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h +++ b/drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h @@ -11,7 +11,6 @@ #define TX_POWER_NEAR_FIELD_THRESH_LVL2 74 #define TX_POWER_NEAR_FIELD_THRESH_LVL1 67 #define TX_POWER_NEAR_FIELD_THRESH_AP 0x3F -#define TX_POWER_NEAR_FIELD_THRESH_8812 60 #define TxHighPwrLevel_Normal 0 #define TxHighPwrLevel_Level1 1 diff --git a/drivers/staging/rtl8723bs/include/hal_phy.h b/drivers/staging/rtl8723bs/include/hal_phy.h index abc0f27fdaa4..ec9bc47816db 100644 --- a/drivers/staging/rtl8723bs/include/hal_phy.h +++ b/drivers/staging/rtl8723bs/include/hal_phy.h @@ -17,16 +17,6 @@ /*--------------------------Define Parameters-------------------------------*/ -enum { - RF_TYPE_MIN = 0, /* 0 */ - RF_8225 = 1, /* 1 11b/g RF for verification only */ - RF_8256 = 2, /* 2 11b/g/n */ - RF_8258 = 3, /* 3 11a/b/g/n RF */ - RF_6052 = 4, /* 4 11b/g/n RF */ - RF_PSEUDO_11N = 5, /* 5, It is a temporality RF. */ - RF_TYPE_MAX -}; - enum rf_path { RF_PATH_A = 0, RF_PATH_B, @@ -34,12 +24,6 @@ enum rf_path { }; #define TX_1S 0 -#define TX_2S 1 -#define TX_3S 2 -#define TX_4S 3 - -#define RF_PATH_MAX_92C_88E 2 -#define RF_PATH_MAX_90_8812 4 /* Max RF number 90 support */ enum wireless_mode { WIRELESS_MODE_UNKNOWN = 0x00, -- cgit v1.2.3 From 758be99c46265b74476d5e1173d781abe325533e Mon Sep 17 00:00:00 2001 From: Philip Nielsen Date: Tue, 1 Sep 2026 12:39:19 +0200 Subject: staging: rtl8723bs: avoid CamelCase in rtw_efuse Avoid CamelCase naming for local variables, function parameters, and static helper functions in rtw_efuse.c as well as associated prototypes in rtw_efuse.h to adhere to the Linux kernel coding style and clear checkpatch.pl checks. Signed-off-by: Philip Nielsen Link: https://patch.msgid.link/20260901103919.20245-1-philipnielsen64@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_efuse.c | 72 +++++++++++++-------------- drivers/staging/rtl8723bs/include/rtw_efuse.h | 4 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c index 7e215c9845f6..b2d22307b115 100644 --- a/drivers/staging/rtl8723bs/core/rtw_efuse.c +++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c @@ -41,48 +41,48 @@ rtw_efuse_calculate_word_counts(u8 word_en) * 09/23/2008 MHC Copy from WMAC. * */ -u8 rtw_efuse_read_1_byte(struct adapter *Adapter, u16 Address) +u8 rtw_efuse_read_1_byte(struct adapter *adapter, u16 address) { - u8 Bytetemp = {0x00}; + u8 byte_temp = {0x00}; u8 temp = {0x00}; u32 k = 0; - u16 contentLen = 0; + u16 content_len = 0; - Hal_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, &contentLen); + Hal_GetEfuseDefinition(adapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, &content_len); - if (Address < contentLen) {/* E-fuse 512Byte */ + if (address < content_len) {/* E-fuse 512Byte */ /* Write E-fuse Register address bit0~7 */ - temp = Address & 0xFF; - rtw_write8(Adapter, EFUSE_CTRL + 1, temp); - Bytetemp = rtw_read8(Adapter, EFUSE_CTRL + 2); + temp = address & 0xFF; + rtw_write8(adapter, EFUSE_CTRL + 1, temp); + byte_temp = rtw_read8(adapter, EFUSE_CTRL + 2); /* Write E-fuse Register address bit8~9 */ - temp = ((Address >> 8) & 0x03) | (Bytetemp & 0xFC); - rtw_write8(Adapter, EFUSE_CTRL + 2, temp); + temp = ((address >> 8) & 0x03) | (byte_temp & 0xFC); + rtw_write8(adapter, EFUSE_CTRL + 2, temp); /* Write 0x30[31]= 0 */ - Bytetemp = rtw_read8(Adapter, EFUSE_CTRL + 3); - temp = Bytetemp & 0x7F; - rtw_write8(Adapter, EFUSE_CTRL + 3, temp); + byte_temp = rtw_read8(adapter, EFUSE_CTRL + 3); + temp = byte_temp & 0x7F; + rtw_write8(adapter, EFUSE_CTRL + 3, temp); /* Wait Write-ready (0x30[31]= 1) */ - Bytetemp = rtw_read8(Adapter, EFUSE_CTRL + 3); - while (!(Bytetemp & 0x80)) { - Bytetemp = rtw_read8(Adapter, EFUSE_CTRL + 3); + byte_temp = rtw_read8(adapter, EFUSE_CTRL + 3); + while (!(byte_temp & 0x80)) { + byte_temp = rtw_read8(adapter, EFUSE_CTRL + 3); k++; if (k == 1000) break; } - return rtw_read8(Adapter, EFUSE_CTRL); + return rtw_read8(adapter, EFUSE_CTRL); } else { return 0xFF; } } /* rtw_efuse_read_1_byte */ -/* 11/16/2008 MH Read one byte from real Efuse. */ +/* 11/16/2008 MH Read one byte from real efuse. */ u8 rtw_efuse_one_byte_read(struct adapter *padapter, u16 addr, u8 *data) { u32 tmpidx = 0; - u8 bResult; + u8 b_result; u8 readbyte; /* <20130121, Kordan> For SMIC EFUSE specificatoin. */ @@ -107,19 +107,19 @@ u8 rtw_efuse_one_byte_read(struct adapter *padapter, u16 addr, u8 *data) } if (tmpidx < 100) { *data = rtw_read8(padapter, EFUSE_CTRL); - bResult = true; + b_result = true; } else { *data = 0xff; - bResult = false; + b_result = false; } - return bResult; + return b_result; } /*----------------------------------------------------------------------------- - * Function: Efuse_ReadAllMap + * Function: efuse_read_all_map * - * Overview: Read All Efuse content + * Overview: Read All efuse content * * Input: NONE * @@ -132,15 +132,15 @@ u8 rtw_efuse_one_byte_read(struct adapter *padapter, u16 addr, u8 *data) * 11/11/2008 MHC Create Version 0. * */ -static void Efuse_ReadAllMap(struct adapter *padapter, u8 efuseType, u8 *Efuse) +static void efuse_read_all_map(struct adapter *padapter, u8 efuse_type, u8 *efuse) { - u16 mapLen = 0; + u16 map_len = 0; Hal_EfusePowerSwitch(padapter, true); - Hal_GetEfuseDefinition(padapter, efuseType, TYPE_EFUSE_MAP_LEN, &mapLen); + Hal_GetEfuseDefinition(padapter, efuse_type, TYPE_EFUSE_MAP_LEN, &map_len); - Hal_ReadEFuse(padapter, efuseType, 0, mapLen, Efuse); + Hal_ReadEFuse(padapter, efuse_type, 0, map_len, efuse); Hal_EfusePowerSwitch(padapter, false); } @@ -161,18 +161,18 @@ static void Efuse_ReadAllMap(struct adapter *padapter, u8 efuseType, u8 *Efuse) * 11/13/2008 MHC Create Version 0. * */ -void rtw_efuse_shadow_map_update(struct adapter *padapter, u8 efuseType) +void rtw_efuse_shadow_map_update(struct adapter *padapter, u8 efuse_type) { - struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); - u16 mapLen = 0; + struct eeprom_priv *eeprom = GET_EEPROM_EFUSE_PRIV(padapter); + u16 map_len = 0; - Hal_GetEfuseDefinition(padapter, efuseType, TYPE_EFUSE_MAP_LEN, &mapLen); + Hal_GetEfuseDefinition(padapter, efuse_type, TYPE_EFUSE_MAP_LEN, &map_len); - if (pEEPROM->bautoload_fail_flag) - memset(pEEPROM->efuse_eeprom_data, 0xFF, mapLen); + if (eeprom->bautoload_fail_flag) + memset(eeprom->efuse_eeprom_data, 0xFF, map_len); else - Efuse_ReadAllMap(padapter, efuseType, pEEPROM->efuse_eeprom_data); + efuse_read_all_map(padapter, efuse_type, eeprom->efuse_eeprom_data); /* PlatformMoveMemory((void *)&pHalData->EfuseMap[EFUSE_MODIFY_MAP][0], */ - /* void *)&pHalData->EfuseMap[EFUSE_INIT_MAP][0], mapLen); */ + /* void *)&pHalData->EfuseMap[EFUSE_INIT_MAP][0], map_len); */ } /* rtw_efuse_shadow_map_update */ diff --git a/drivers/staging/rtl8723bs/include/rtw_efuse.h b/drivers/staging/rtl8723bs/include/rtw_efuse.h index a60e05cf699c..1e5d61f4587b 100644 --- a/drivers/staging/rtl8723bs/include/rtw_efuse.h +++ b/drivers/staging/rtl8723bs/include/rtw_efuse.h @@ -71,7 +71,7 @@ struct efuse_hal { u8 rtw_efuse_calculate_word_counts(u8 word_en); u8 rtw_efuse_one_byte_read(struct adapter *padapter, u16 addr, u8 *data); -u8 rtw_efuse_read_1_byte(struct adapter *padapter, u16 Address); -void rtw_efuse_shadow_map_update(struct adapter *padapter, u8 efuseType); +u8 rtw_efuse_read_1_byte(struct adapter *padapter, u16 address); +void rtw_efuse_shadow_map_update(struct adapter *padapter, u8 efuse_type); #endif -- cgit v1.2.3