* [PATCH v7 1/7] staging: rtl8723bs: rename LinkDetectInfo to link_detect_info
2026-02-12 14:21 [PATCH v7 0/7] staging: rtl8723bs: coding style and refactoring cleanups Khushal Chitturi
@ 2026-02-12 14:21 ` Khushal Chitturi
2026-02-12 14:21 ` [PATCH v7 2/7] staging: rtl8723bs: rename rt_link_detect_t fields to snake_case Khushal Chitturi
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Khushal Chitturi @ 2026-02-12 14:21 UTC (permalink / raw)
To: gregkh
Cc: dan.carpenter, straube.linux, hansg, ethantidmore06,
linux-staging, linux-kernel, Khushal Chitturi
Rename LinkDetectInfo to link_detect_info in struct mlme_priv
to follow naming conventions.
Signed-off-by: Khushal Chitturi <khushalchitturi@gmail.com>
---
Changelog:
v6 -> v7: Further split patches, limiting this patch to renaming
LinkDetectInfo only.
v5 -> v6: Limited the changes to LinkDetectInfo renaming, and local
variables of traffic_status_watchdog.
v4 -> v5: Rebased onto current staging-testing.
v3 -> v4: Narrow rename scope to affect link detection, and adjusted
formatting.
v2 -> v3: Resubmitted as a versioned series.
v1 -> v2: Corrected commit messages.
drivers/staging/rtl8723bs/core/rtw_cmd.c | 54 +++++++++----------
.../staging/rtl8723bs/core/rtw_ioctl_set.c | 6 +--
drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 ++--
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 10 ++--
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +-
drivers/staging/rtl8723bs/core/rtw_recv.c | 4 +-
drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +-
drivers/staging/rtl8723bs/hal/hal_btcoex.c | 4 +-
.../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 4 +-
drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +-
.../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +-
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 8 +--
12 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index b2e7f479f72b..bd1eed3d98fb 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -1143,51 +1143,51 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
if ((check_fwstate(pmlmepriv, _FW_LINKED))
/*&& !MgntInitAdapterInProgress(pMgntInfo)*/) {
/* if we raise bBusyTraffic in last watchdog, using lower threshold. */
- if (pmlmepriv->LinkDetectInfo.bBusyTraffic)
+ if (pmlmepriv->link_detect_info.bBusyTraffic)
BusyThreshold = BusyThresholdLow;
- if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold ||
- pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold) {
+ if (pmlmepriv->link_detect_info.NumRxOkInPeriod > BusyThreshold ||
+ pmlmepriv->link_detect_info.NumTxOkInPeriod > BusyThreshold) {
bBusyTraffic = true;
- if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod)
+ if (pmlmepriv->link_detect_info.NumRxOkInPeriod > pmlmepriv->link_detect_info.NumTxOkInPeriod)
bRxBusyTraffic = true;
else
bTxBusyTraffic = true;
}
/* Higher Tx/Rx data. */
- if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 4000 ||
- pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 4000) {
+ if (pmlmepriv->link_detect_info.NumRxOkInPeriod > 4000 ||
+ pmlmepriv->link_detect_info.NumTxOkInPeriod > 4000) {
bHigherBusyTraffic = true;
- if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod)
+ if (pmlmepriv->link_detect_info.NumRxOkInPeriod > pmlmepriv->link_detect_info.NumTxOkInPeriod)
bHigherBusyRxTraffic = true;
else
bHigherBusyTxTraffic = true;
}
/* check traffic for powersaving. */
- if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8) ||
- (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) {
+ if (((pmlmepriv->link_detect_info.NumRxUnicastOkInPeriod + pmlmepriv->link_detect_info.NumTxOkInPeriod) > 8) ||
+ (pmlmepriv->link_detect_info.NumRxUnicastOkInPeriod > 2)) {
bEnterPS = false;
if (bBusyTraffic) {
- if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount <= 4)
- pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 4;
+ if (pmlmepriv->link_detect_info.TrafficTransitionCount <= 4)
+ pmlmepriv->link_detect_info.TrafficTransitionCount = 4;
- pmlmepriv->LinkDetectInfo.TrafficTransitionCount++;
+ pmlmepriv->link_detect_info.TrafficTransitionCount++;
- if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount > 30/*TrafficTransitionLevel*/)
- pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 30;
+ if (pmlmepriv->link_detect_info.TrafficTransitionCount > 30/*TrafficTransitionLevel*/)
+ pmlmepriv->link_detect_info.TrafficTransitionCount = 30;
}
} else {
- if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount >= 2)
- pmlmepriv->LinkDetectInfo.TrafficTransitionCount -= 2;
+ if (pmlmepriv->link_detect_info.TrafficTransitionCount >= 2)
+ pmlmepriv->link_detect_info.TrafficTransitionCount -= 2;
else
- pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
+ pmlmepriv->link_detect_info.TrafficTransitionCount = 0;
- if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount == 0)
+ if (pmlmepriv->link_detect_info.TrafficTransitionCount == 0)
bEnterPS = true;
}
@@ -1212,15 +1212,15 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
LPS_Leave(padapter, "NON_LINKED");
}
- pmlmepriv->LinkDetectInfo.NumRxOkInPeriod = 0;
- pmlmepriv->LinkDetectInfo.NumTxOkInPeriod = 0;
- pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod = 0;
- pmlmepriv->LinkDetectInfo.bBusyTraffic = bBusyTraffic;
- pmlmepriv->LinkDetectInfo.bTxBusyTraffic = bTxBusyTraffic;
- pmlmepriv->LinkDetectInfo.bRxBusyTraffic = bRxBusyTraffic;
- pmlmepriv->LinkDetectInfo.bHigherBusyTraffic = bHigherBusyTraffic;
- pmlmepriv->LinkDetectInfo.bHigherBusyRxTraffic = bHigherBusyRxTraffic;
- pmlmepriv->LinkDetectInfo.bHigherBusyTxTraffic = bHigherBusyTxTraffic;
+ pmlmepriv->link_detect_info.NumRxOkInPeriod = 0;
+ pmlmepriv->link_detect_info.NumTxOkInPeriod = 0;
+ pmlmepriv->link_detect_info.NumRxUnicastOkInPeriod = 0;
+ pmlmepriv->link_detect_info.bBusyTraffic = bBusyTraffic;
+ pmlmepriv->link_detect_info.bTxBusyTraffic = bTxBusyTraffic;
+ pmlmepriv->link_detect_info.bRxBusyTraffic = bRxBusyTraffic;
+ pmlmepriv->link_detect_info.bHigherBusyTraffic = bHigherBusyTraffic;
+ pmlmepriv->link_detect_info.bHigherBusyRxTraffic = bHigherBusyRxTraffic;
+ pmlmepriv->link_detect_info.bHigherBusyTxTraffic = bHigherBusyTxTraffic;
return bEnterPS;
}
diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index 587a87fbffeb..87fd4b11a7dd 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -61,7 +61,7 @@ u8 rtw_do_join(struct adapter *padapter)
/* when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empty */
/* we try to issue sitesurvey firstly */
- if (pmlmepriv->LinkDetectInfo.bBusyTraffic == false
+ if (pmlmepriv->link_detect_info.bBusyTraffic == false
|| rtw_to_roam(padapter) > 0
) {
/* submit site_survey_cmd */
@@ -113,7 +113,7 @@ u8 rtw_do_join(struct adapter *padapter)
/* when set_ssid/set_bssid for rtw_do_join(), but there are no desired bss in scanning queue */
/* we try to issue sitesurvey firstly */
- if (pmlmepriv->LinkDetectInfo.bBusyTraffic == false
+ if (pmlmepriv->link_detect_info.bBusyTraffic == false
|| rtw_to_roam(padapter) > 0
) {
ret = rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0);
@@ -380,7 +380,7 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s
}
if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) ||
- (pmlmepriv->LinkDetectInfo.bBusyTraffic == true)) {
+ (pmlmepriv->link_detect_info.bBusyTraffic == true)) {
/* Scan or linking is in progress, do nothing. */
res = true;
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 22dc36e8e38a..1217c409abea 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1174,8 +1174,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
spin_lock_bh(&pmlmepriv->lock);
- pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
- pmlmepriv->LinkDetectInfo.LowPowerTransitionCount = 0;
+ pmlmepriv->link_detect_info.TrafficTransitionCount = 0;
+ pmlmepriv->link_detect_info.LowPowerTransitionCount = 0;
if (pnetwork->join_res > 0) {
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
@@ -1615,7 +1615,7 @@ static void rtw_auto_scan_handler(struct adapter *padapter)
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING))
goto exit;
- if (pmlmepriv->LinkDetectInfo.bBusyTraffic)
+ if (pmlmepriv->link_detect_info.bBusyTraffic)
goto exit;
}
@@ -2504,8 +2504,8 @@ 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.LinkDetectInfo.bTxBusyTraffic == false)) */
- if (bmcst || (padapter->mlmepriv.LinkDetectInfo.NumTxOkInPeriod < 100))
+ /* if (bmcst || (padapter->mlmepriv.link_detect_info.bTxBusyTraffic == false)) */
+ if (bmcst || (padapter->mlmepriv.link_detect_info.NumTxOkInPeriod < 100))
return;
priority = pattrib->priority;
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 78abc5f5191f..74aa089a97bd 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -1511,7 +1511,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)
if (ignore_received_deauth == 0)
receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
- pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
+ pmlmepriv->link_detect_info.bBusyTraffic = false;
return _SUCCESS;
}
@@ -1563,7 +1563,7 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame)
receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
- pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
+ pmlmepriv->link_detect_info.bBusyTraffic = false;
return _SUCCESS;
}
@@ -4756,9 +4756,9 @@ static void rtw_mlmeext_disconnect(struct adapter *padapter)
timer_delete_sync(&pmlmeext->link_timer);
- /* pmlmepriv->LinkDetectInfo.TrafficBusyState = false; */
- pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
- pmlmepriv->LinkDetectInfo.LowPowerTransitionCount = 0;
+ /* pmlmepriv->link_detect_info.TrafficBusyState = false; */
+ pmlmepriv->link_detect_info.TrafficTransitionCount = 0;
+ pmlmepriv->link_detect_info.LowPowerTransitionCount = 0;
}
diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index 1c9e02732687..3122435fa91d 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -206,7 +206,7 @@ void traffic_check_for_leave_lps(struct adapter *padapter, u8 tx, u32 tx_packets
}
} else { /* from rx path */
- if (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 4/*2*/) {
+ if (pmlmepriv->link_detect_info.NumRxUnicastOkInPeriod > 4/*2*/) {
if (adapter_to_pwrctl(padapter)->bLeisurePs
&& (adapter_to_pwrctl(padapter)->pwr_mode != PS_MODE_ACTIVE)
&& !(hal_btcoex_IsBtControlLps(padapter)))
diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 337671b1211f..cb20f2bee0a0 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -680,10 +680,10 @@ static void count_rx_stats(struct adapter *padapter, union recv_frame *prframe,
sz = get_recvframe_len(prframe);
precvpriv->rx_bytes += sz;
- padapter->mlmepriv.LinkDetectInfo.NumRxOkInPeriod++;
+ padapter->mlmepriv.link_detect_info.NumRxOkInPeriod++;
if ((!is_broadcast_ether_addr(pattrib->dst)) && (!is_multicast_ether_addr(pattrib->dst)))
- padapter->mlmepriv.LinkDetectInfo.NumRxUnicastOkInPeriod++;
+ padapter->mlmepriv.link_detect_info.NumRxUnicastOkInPeriod++;
if (sta)
psta = sta;
diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index 222851e8d985..976f6f6ed029 100644
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -1414,7 +1414,7 @@ void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe,
if ((pxmitframe->frame_tag & 0x0f) == DATA_FRAMETAG) {
pkt_num = pxmitframe->agg_num;
- pmlmepriv->LinkDetectInfo.NumTxOkInPeriod += pkt_num;
+ pmlmepriv->link_detect_info.NumTxOkInPeriod += pkt_num;
pxmitpriv->tx_pkts += pkt_num;
diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
index 9105594d2dde..973d2e6a9d6a 100644
--- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c
+++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
@@ -167,7 +167,7 @@ static u8 halbtcoutsrc_IsWifiBusy(struct adapter *padapter)
if (check_fwstate(pmlmepriv, WIFI_ASOC_STATE) == true) {
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
return true;
- if (pmlmepriv->LinkDetectInfo.bBusyTraffic)
+ if (pmlmepriv->link_detect_info.bBusyTraffic)
return true;
}
@@ -364,7 +364,7 @@ static u8 halbtcoutsrc_Get(void *pBtcContext, u8 getType, void *pOutBuf)
case BTC_GET_U4_WIFI_TRAFFIC_DIRECTION:
{
struct rt_link_detect_t *plinkinfo;
- plinkinfo = &padapter->mlmepriv.LinkDetectInfo;
+ plinkinfo = &padapter->mlmepriv.link_detect_info;
if (plinkinfo->NumTxOkInPeriod > plinkinfo->NumRxOkInPeriod)
*pU4Tmp = BTC_WIFI_TRAFFIC_TX;
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index a1f2cbf2cf55..a8d3a3b16c95 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -202,7 +202,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
if (
(check_pending_xmitbuf(pxmitpriv)) &&
- (padapter->mlmepriv.LinkDetectInfo.bHigherBusyTxTraffic)
+ (padapter->mlmepriv.link_detect_info.bHigherBusyTxTraffic)
) {
if ((phwxmit->accnt > 0) && (phwxmit->accnt < 5)) {
err = -2;
@@ -482,7 +482,7 @@ s32 rtl8723bs_hal_xmit(
(pxmitframe->attrib.ether_type != 0x888e) &&
(pxmitframe->attrib.dhcp_pkt != 1)
) {
- if (padapter->mlmepriv.LinkDetectInfo.bBusyTraffic)
+ if (padapter->mlmepriv.link_detect_info.bBusyTraffic)
rtw_issue_addbareq_cmd(padapter, pxmitframe);
}
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h
index 2a128568c6df..1659c4b43957 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h
@@ -171,7 +171,7 @@ struct mlme_priv {
struct ht_priv htpriv;
- struct rt_link_detect_t LinkDetectInfo;
+ struct rt_link_detect_t link_detect_info;
struct timer_list dynamic_chk_timer; /* dynamic/periodic check timer */
u8 acm_mask; /* for wmm acm mask */
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index a47d0d3fa2b7..88ba148bbc78 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1231,7 +1231,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
goto check_need_indicate_scan_done;
}
- if (pmlmepriv->LinkDetectInfo.bBusyTraffic == true) {
+ if (pmlmepriv->link_detect_info.bBusyTraffic == true) {
static unsigned long lastscantime;
unsigned long passtime;
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 21a0c3cf4c31..572ee4124b52 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -618,11 +618,11 @@ void rtw_reset_drv_sw(struct adapter *padapter)
padapter->xmitpriv.tx_pkts = 0;
padapter->recvpriv.rx_pkts = 0;
- pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
+ pmlmepriv->link_detect_info.bBusyTraffic = false;
- /* pmlmepriv->LinkDetectInfo.TrafficBusyState = false; */
- pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
- pmlmepriv->LinkDetectInfo.LowPowerTransitionCount = 0;
+ /* pmlmepriv->link_detect_info.TrafficBusyState = false; */
+ pmlmepriv->link_detect_info.TrafficTransitionCount = 0;
+ pmlmepriv->link_detect_info.LowPowerTransitionCount = 0;
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);
--
2.52.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v7 2/7] staging: rtl8723bs: rename rt_link_detect_t fields to snake_case
2026-02-12 14:21 [PATCH v7 0/7] staging: rtl8723bs: coding style and refactoring cleanups Khushal Chitturi
2026-02-12 14:21 ` [PATCH v7 1/7] staging: rtl8723bs: rename LinkDetectInfo to link_detect_info Khushal Chitturi
@ 2026-02-12 14:21 ` Khushal Chitturi
2026-02-12 14:21 ` [PATCH v7 3/7] staging: rtl8723bs: convert traffic_status_watchdog() local variables " Khushal Chitturi
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Khushal Chitturi @ 2026-02-12 14:21 UTC (permalink / raw)
To: gregkh
Cc: dan.carpenter, straube.linux, hansg, ethantidmore06,
linux-staging, linux-kernel, Khushal Chitturi
Convert the CamelCase field names in struct rt_link_detect_t to
snake_case to follow naming conventions.
Signed-off-by: Khushal Chitturi <khushalchitturi@gmail.com>
---
Changelog:
v6 -> v7: Split from previous patch.
drivers/staging/rtl8723bs/core/rtw_cmd.c | 54 +++++++++----------
.../staging/rtl8723bs/core/rtw_ioctl_set.c | 6 +--
drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 ++--
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 8 +--
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +-
drivers/staging/rtl8723bs/core/rtw_recv.c | 4 +-
drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +-
drivers/staging/rtl8723bs/hal/hal_btcoex.c | 4 +-
.../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 4 +-
drivers/staging/rtl8723bs/include/rtw_mlme.h | 22 ++++----
.../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +-
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 6 +--
12 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index bd1eed3d98fb..b3fa54f7f7a9 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -1143,51 +1143,51 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
if ((check_fwstate(pmlmepriv, _FW_LINKED))
/*&& !MgntInitAdapterInProgress(pMgntInfo)*/) {
/* if we raise bBusyTraffic in last watchdog, using lower threshold. */
- if (pmlmepriv->link_detect_info.bBusyTraffic)
+ if (pmlmepriv->link_detect_info.busy_traffic)
BusyThreshold = BusyThresholdLow;
- if (pmlmepriv->link_detect_info.NumRxOkInPeriod > BusyThreshold ||
- pmlmepriv->link_detect_info.NumTxOkInPeriod > BusyThreshold) {
+ if (pmlmepriv->link_detect_info.num_rx_ok_in_period > BusyThreshold ||
+ pmlmepriv->link_detect_info.num_tx_ok_in_period > BusyThreshold) {
bBusyTraffic = true;
- if (pmlmepriv->link_detect_info.NumRxOkInPeriod > pmlmepriv->link_detect_info.NumTxOkInPeriod)
+ if (pmlmepriv->link_detect_info.num_rx_ok_in_period > pmlmepriv->link_detect_info.num_tx_ok_in_period)
bRxBusyTraffic = true;
else
bTxBusyTraffic = true;
}
/* Higher Tx/Rx data. */
- if (pmlmepriv->link_detect_info.NumRxOkInPeriod > 4000 ||
- pmlmepriv->link_detect_info.NumTxOkInPeriod > 4000) {
+ if (pmlmepriv->link_detect_info.num_rx_ok_in_period > 4000 ||
+ pmlmepriv->link_detect_info.num_tx_ok_in_period > 4000) {
bHigherBusyTraffic = true;
- if (pmlmepriv->link_detect_info.NumRxOkInPeriod > pmlmepriv->link_detect_info.NumTxOkInPeriod)
+ if (pmlmepriv->link_detect_info.num_rx_ok_in_period > pmlmepriv->link_detect_info.num_tx_ok_in_period)
bHigherBusyRxTraffic = true;
else
bHigherBusyTxTraffic = true;
}
/* check traffic for powersaving. */
- if (((pmlmepriv->link_detect_info.NumRxUnicastOkInPeriod + pmlmepriv->link_detect_info.NumTxOkInPeriod) > 8) ||
- (pmlmepriv->link_detect_info.NumRxUnicastOkInPeriod > 2)) {
+ if (((pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period + pmlmepriv->link_detect_info.num_tx_ok_in_period) > 8) ||
+ (pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period > 2)) {
bEnterPS = false;
if (bBusyTraffic) {
- if (pmlmepriv->link_detect_info.TrafficTransitionCount <= 4)
- pmlmepriv->link_detect_info.TrafficTransitionCount = 4;
+ if (pmlmepriv->link_detect_info.traffic_transition_count <= 4)
+ pmlmepriv->link_detect_info.traffic_transition_count = 4;
- pmlmepriv->link_detect_info.TrafficTransitionCount++;
+ pmlmepriv->link_detect_info.traffic_transition_count++;
- if (pmlmepriv->link_detect_info.TrafficTransitionCount > 30/*TrafficTransitionLevel*/)
- pmlmepriv->link_detect_info.TrafficTransitionCount = 30;
+ if (pmlmepriv->link_detect_info.traffic_transition_count > 30/*TrafficTransitionLevel*/)
+ pmlmepriv->link_detect_info.traffic_transition_count = 30;
}
} else {
- if (pmlmepriv->link_detect_info.TrafficTransitionCount >= 2)
- pmlmepriv->link_detect_info.TrafficTransitionCount -= 2;
+ if (pmlmepriv->link_detect_info.traffic_transition_count >= 2)
+ pmlmepriv->link_detect_info.traffic_transition_count -= 2;
else
- pmlmepriv->link_detect_info.TrafficTransitionCount = 0;
+ pmlmepriv->link_detect_info.traffic_transition_count = 0;
- if (pmlmepriv->link_detect_info.TrafficTransitionCount == 0)
+ if (pmlmepriv->link_detect_info.traffic_transition_count == 0)
bEnterPS = true;
}
@@ -1212,15 +1212,15 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
LPS_Leave(padapter, "NON_LINKED");
}
- pmlmepriv->link_detect_info.NumRxOkInPeriod = 0;
- pmlmepriv->link_detect_info.NumTxOkInPeriod = 0;
- pmlmepriv->link_detect_info.NumRxUnicastOkInPeriod = 0;
- pmlmepriv->link_detect_info.bBusyTraffic = bBusyTraffic;
- pmlmepriv->link_detect_info.bTxBusyTraffic = bTxBusyTraffic;
- pmlmepriv->link_detect_info.bRxBusyTraffic = bRxBusyTraffic;
- pmlmepriv->link_detect_info.bHigherBusyTraffic = bHigherBusyTraffic;
- pmlmepriv->link_detect_info.bHigherBusyRxTraffic = bHigherBusyRxTraffic;
- pmlmepriv->link_detect_info.bHigherBusyTxTraffic = bHigherBusyTxTraffic;
+ pmlmepriv->link_detect_info.num_rx_ok_in_period = 0;
+ pmlmepriv->link_detect_info.num_tx_ok_in_period = 0;
+ pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period = 0;
+ pmlmepriv->link_detect_info.busy_traffic = bBusyTraffic;
+ pmlmepriv->link_detect_info.tx_busy_traffic = bTxBusyTraffic;
+ pmlmepriv->link_detect_info.rx_busy_traffic = bRxBusyTraffic;
+ pmlmepriv->link_detect_info.higher_busy_traffic = bHigherBusyTraffic;
+ pmlmepriv->link_detect_info.higher_busy_rx_traffic = bHigherBusyRxTraffic;
+ pmlmepriv->link_detect_info.higher_busy_tx_traffic = bHigherBusyTxTraffic;
return bEnterPS;
}
diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index 87fd4b11a7dd..c41595d03c08 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -61,7 +61,7 @@ u8 rtw_do_join(struct adapter *padapter)
/* when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empty */
/* we try to issue sitesurvey firstly */
- if (pmlmepriv->link_detect_info.bBusyTraffic == false
+ if (pmlmepriv->link_detect_info.busy_traffic == false
|| rtw_to_roam(padapter) > 0
) {
/* submit site_survey_cmd */
@@ -113,7 +113,7 @@ u8 rtw_do_join(struct adapter *padapter)
/* when set_ssid/set_bssid for rtw_do_join(), but there are no desired bss in scanning queue */
/* we try to issue sitesurvey firstly */
- if (pmlmepriv->link_detect_info.bBusyTraffic == false
+ if (pmlmepriv->link_detect_info.busy_traffic == false
|| rtw_to_roam(padapter) > 0
) {
ret = rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0);
@@ -380,7 +380,7 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s
}
if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) ||
- (pmlmepriv->link_detect_info.bBusyTraffic == true)) {
+ (pmlmepriv->link_detect_info.busy_traffic == true)) {
/* Scan or linking is in progress, do nothing. */
res = true;
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 1217c409abea..944f56b7acf5 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1174,8 +1174,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
spin_lock_bh(&pmlmepriv->lock);
- pmlmepriv->link_detect_info.TrafficTransitionCount = 0;
- pmlmepriv->link_detect_info.LowPowerTransitionCount = 0;
+ pmlmepriv->link_detect_info.traffic_transition_count = 0;
+ pmlmepriv->link_detect_info.low_power_transition_count = 0;
if (pnetwork->join_res > 0) {
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
@@ -1615,7 +1615,7 @@ static void rtw_auto_scan_handler(struct adapter *padapter)
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING))
goto exit;
- if (pmlmepriv->link_detect_info.bBusyTraffic)
+ if (pmlmepriv->link_detect_info.busy_traffic)
goto exit;
}
@@ -2504,8 +2504,8 @@ 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.bTxBusyTraffic == false)) */
- if (bmcst || (padapter->mlmepriv.link_detect_info.NumTxOkInPeriod < 100))
+ /* if (bmcst || (padapter->mlmepriv.link_detect_info.tx_busy_traffic == false)) */
+ if (bmcst || (padapter->mlmepriv.link_detect_info.num_tx_ok_in_period < 100))
return;
priority = pattrib->priority;
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 74aa089a97bd..6a85cf9cecfc 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -1511,7 +1511,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)
if (ignore_received_deauth == 0)
receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
- pmlmepriv->link_detect_info.bBusyTraffic = false;
+ pmlmepriv->link_detect_info.busy_traffic = false;
return _SUCCESS;
}
@@ -1563,7 +1563,7 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame)
receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
- pmlmepriv->link_detect_info.bBusyTraffic = false;
+ pmlmepriv->link_detect_info.busy_traffic = false;
return _SUCCESS;
}
@@ -4757,8 +4757,8 @@ static void rtw_mlmeext_disconnect(struct adapter *padapter)
timer_delete_sync(&pmlmeext->link_timer);
/* pmlmepriv->link_detect_info.TrafficBusyState = false; */
- pmlmepriv->link_detect_info.TrafficTransitionCount = 0;
- pmlmepriv->link_detect_info.LowPowerTransitionCount = 0;
+ pmlmepriv->link_detect_info.traffic_transition_count = 0;
+ pmlmepriv->link_detect_info.low_power_transition_count = 0;
}
diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index 3122435fa91d..15657de5475e 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -206,7 +206,7 @@ void traffic_check_for_leave_lps(struct adapter *padapter, u8 tx, u32 tx_packets
}
} else { /* from rx path */
- if (pmlmepriv->link_detect_info.NumRxUnicastOkInPeriod > 4/*2*/) {
+ if (pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period > 4/*2*/) {
if (adapter_to_pwrctl(padapter)->bLeisurePs
&& (adapter_to_pwrctl(padapter)->pwr_mode != PS_MODE_ACTIVE)
&& !(hal_btcoex_IsBtControlLps(padapter)))
diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
index cb20f2bee0a0..beaadcaff967 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -680,10 +680,10 @@ static void count_rx_stats(struct adapter *padapter, union recv_frame *prframe,
sz = get_recvframe_len(prframe);
precvpriv->rx_bytes += sz;
- padapter->mlmepriv.link_detect_info.NumRxOkInPeriod++;
+ padapter->mlmepriv.link_detect_info.num_rx_ok_in_period++;
if ((!is_broadcast_ether_addr(pattrib->dst)) && (!is_multicast_ether_addr(pattrib->dst)))
- padapter->mlmepriv.link_detect_info.NumRxUnicastOkInPeriod++;
+ padapter->mlmepriv.link_detect_info.num_rx_unicast_ok_in_period++;
if (sta)
psta = sta;
diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index 976f6f6ed029..da0ec4c05208 100644
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -1414,7 +1414,7 @@ void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe,
if ((pxmitframe->frame_tag & 0x0f) == DATA_FRAMETAG) {
pkt_num = pxmitframe->agg_num;
- pmlmepriv->link_detect_info.NumTxOkInPeriod += pkt_num;
+ pmlmepriv->link_detect_info.num_tx_ok_in_period += pkt_num;
pxmitpriv->tx_pkts += pkt_num;
diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
index 973d2e6a9d6a..9c84f4cf1dda 100644
--- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c
+++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
@@ -167,7 +167,7 @@ static u8 halbtcoutsrc_IsWifiBusy(struct adapter *padapter)
if (check_fwstate(pmlmepriv, WIFI_ASOC_STATE) == true) {
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
return true;
- if (pmlmepriv->link_detect_info.bBusyTraffic)
+ if (pmlmepriv->link_detect_info.busy_traffic)
return true;
}
@@ -366,7 +366,7 @@ static u8 halbtcoutsrc_Get(void *pBtcContext, u8 getType, void *pOutBuf)
struct rt_link_detect_t *plinkinfo;
plinkinfo = &padapter->mlmepriv.link_detect_info;
- if (plinkinfo->NumTxOkInPeriod > plinkinfo->NumRxOkInPeriod)
+ if (plinkinfo->num_tx_ok_in_period > plinkinfo->num_rx_ok_in_period)
*pU4Tmp = BTC_WIFI_TRAFFIC_TX;
else
*pU4Tmp = BTC_WIFI_TRAFFIC_RX;
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index a8d3a3b16c95..379d29d3f9d3 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -202,7 +202,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
if (
(check_pending_xmitbuf(pxmitpriv)) &&
- (padapter->mlmepriv.link_detect_info.bHigherBusyTxTraffic)
+ (padapter->mlmepriv.link_detect_info.higher_busy_tx_traffic)
) {
if ((phwxmit->accnt > 0) && (phwxmit->accnt < 5)) {
err = -2;
@@ -482,7 +482,7 @@ s32 rtl8723bs_hal_xmit(
(pxmitframe->attrib.ether_type != 0x888e) &&
(pxmitframe->attrib.dhcp_pkt != 1)
) {
- if (padapter->mlmepriv.link_detect_info.bBusyTraffic)
+ if (padapter->mlmepriv.link_detect_info.busy_traffic)
rtw_issue_addbareq_cmd(padapter, pxmitframe);
}
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h
index 1659c4b43957..66d522006dfb 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h
@@ -93,18 +93,18 @@ struct sitesurvey_ctrl {
};
struct rt_link_detect_t {
- u32 NumTxOkInPeriod;
- u32 NumRxOkInPeriod;
- u32 NumRxUnicastOkInPeriod;
- bool bBusyTraffic;
- bool bTxBusyTraffic;
- bool bRxBusyTraffic;
- bool bHigherBusyTraffic; /* For interrupt migration purpose. */
- bool bHigherBusyRxTraffic; /* We may disable Tx interrupt according as Rx traffic. */
- bool bHigherBusyTxTraffic; /* We may disable Tx interrupt according as Tx traffic. */
+ u32 num_tx_ok_in_period;
+ u32 num_rx_ok_in_period;
+ u32 num_rx_unicast_ok_in_period;
+ bool busy_traffic;
+ bool tx_busy_traffic;
+ bool rx_busy_traffic;
+ bool higher_busy_traffic; /* For interrupt migration purpose. */
+ bool higher_busy_rx_traffic; /* We may disable Tx interrupt according as Rx traffic. */
+ bool higher_busy_tx_traffic; /* We may disable Tx interrupt according as Tx traffic. */
/* u8 TrafficBusyState; */
- u8 TrafficTransitionCount;
- u32 LowPowerTransitionCount;
+ u8 traffic_transition_count;
+ u32 low_power_transition_count;
};
/* used for mlme_priv.roam_flags */
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 88ba148bbc78..983669189d41 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1231,7 +1231,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
goto check_need_indicate_scan_done;
}
- if (pmlmepriv->link_detect_info.bBusyTraffic == true) {
+ if (pmlmepriv->link_detect_info.busy_traffic == true) {
static unsigned long lastscantime;
unsigned long passtime;
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 572ee4124b52..953e29ad2c44 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -618,11 +618,11 @@ void rtw_reset_drv_sw(struct adapter *padapter)
padapter->xmitpriv.tx_pkts = 0;
padapter->recvpriv.rx_pkts = 0;
- pmlmepriv->link_detect_info.bBusyTraffic = false;
+ pmlmepriv->link_detect_info.busy_traffic = false;
/* pmlmepriv->link_detect_info.TrafficBusyState = false; */
- pmlmepriv->link_detect_info.TrafficTransitionCount = 0;
- pmlmepriv->link_detect_info.LowPowerTransitionCount = 0;
+ pmlmepriv->link_detect_info.traffic_transition_count = 0;
+ pmlmepriv->link_detect_info.low_power_transition_count = 0;
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);
--
2.52.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v7 3/7] staging: rtl8723bs: convert traffic_status_watchdog() local variables to snake_case
2026-02-12 14:21 [PATCH v7 0/7] staging: rtl8723bs: coding style and refactoring cleanups Khushal Chitturi
2026-02-12 14:21 ` [PATCH v7 1/7] staging: rtl8723bs: rename LinkDetectInfo to link_detect_info Khushal Chitturi
2026-02-12 14:21 ` [PATCH v7 2/7] staging: rtl8723bs: rename rt_link_detect_t fields to snake_case Khushal Chitturi
@ 2026-02-12 14:21 ` Khushal Chitturi
2026-02-12 14:21 ` [PATCH v7 4/7] staging: rtl8723bs: remove stale commented code Khushal Chitturi
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Khushal Chitturi @ 2026-02-12 14:21 UTC (permalink / raw)
To: gregkh
Cc: dan.carpenter, straube.linux, hansg, ethantidmore06,
linux-staging, linux-kernel, Khushal Chitturi
Convert the local variable names in traffic_status_watchdog()
to snake_case to follow naming conventions.
Signed-off-by: Khushal Chitturi <khushalchitturi@gmail.com>
---
Changelog:
v6 -> v7: Split from earlier patch.
drivers/staging/rtl8723bs/core/rtw_cmd.c | 56 +++++++++++------------
drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +--
2 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index b3fa54f7f7a9..d6b486fb57ab 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -1127,12 +1127,12 @@ static void collect_traffic_statistics(struct adapter *padapter)
u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
{
- u8 bEnterPS = false;
- u16 BusyThresholdHigh = 25;
- u16 BusyThresholdLow = 10;
- u16 BusyThreshold = BusyThresholdHigh;
- u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false;
- u8 bHigherBusyTraffic = false, bHigherBusyRxTraffic = false, bHigherBusyTxTraffic = false;
+ u8 should_enter_ps = false;
+ u16 busy_threshold_high = 25;
+ u16 busy_threshold_low = 10;
+ u16 busy_threshold = busy_threshold_high;
+ u8 busy_traffic = false, tx_busy_traffic = false, rx_busy_traffic = false;
+ u8 higher_busy_traffic = false, higher_busy_rx_traffic = false, higher_busy_tx_traffic = false;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
collect_traffic_statistics(padapter);
@@ -1142,37 +1142,37 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
/* */
if ((check_fwstate(pmlmepriv, _FW_LINKED))
/*&& !MgntInitAdapterInProgress(pMgntInfo)*/) {
- /* if we raise bBusyTraffic in last watchdog, using lower threshold. */
+ /* if we raise busy_traffic in last watchdog, using lower threshold. */
if (pmlmepriv->link_detect_info.busy_traffic)
- BusyThreshold = BusyThresholdLow;
+ busy_threshold = busy_threshold_low;
- if (pmlmepriv->link_detect_info.num_rx_ok_in_period > BusyThreshold ||
- pmlmepriv->link_detect_info.num_tx_ok_in_period > BusyThreshold) {
- bBusyTraffic = true;
+ if (pmlmepriv->link_detect_info.num_rx_ok_in_period > busy_threshold ||
+ pmlmepriv->link_detect_info.num_tx_ok_in_period > busy_threshold) {
+ busy_traffic = true;
if (pmlmepriv->link_detect_info.num_rx_ok_in_period > pmlmepriv->link_detect_info.num_tx_ok_in_period)
- bRxBusyTraffic = true;
+ rx_busy_traffic = true;
else
- bTxBusyTraffic = true;
+ tx_busy_traffic = true;
}
/* Higher Tx/Rx data. */
if (pmlmepriv->link_detect_info.num_rx_ok_in_period > 4000 ||
pmlmepriv->link_detect_info.num_tx_ok_in_period > 4000) {
- bHigherBusyTraffic = true;
+ higher_busy_traffic = true;
if (pmlmepriv->link_detect_info.num_rx_ok_in_period > pmlmepriv->link_detect_info.num_tx_ok_in_period)
- bHigherBusyRxTraffic = true;
+ higher_busy_rx_traffic = true;
else
- bHigherBusyTxTraffic = true;
+ higher_busy_tx_traffic = true;
}
/* check traffic for powersaving. */
if (((pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period + pmlmepriv->link_detect_info.num_tx_ok_in_period) > 8) ||
(pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period > 2)) {
- bEnterPS = false;
+ should_enter_ps = false;
- if (bBusyTraffic) {
+ if (busy_traffic) {
if (pmlmepriv->link_detect_info.traffic_transition_count <= 4)
pmlmepriv->link_detect_info.traffic_transition_count = 4;
@@ -1188,11 +1188,11 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
pmlmepriv->link_detect_info.traffic_transition_count = 0;
if (pmlmepriv->link_detect_info.traffic_transition_count == 0)
- bEnterPS = true;
+ should_enter_ps = true;
}
/* LeisurePS only work in infra mode. */
- if (bEnterPS) {
+ if (should_enter_ps) {
if (!from_timer)
LPS_Enter(padapter, "TRAFFIC_IDLE");
} else {
@@ -1215,14 +1215,14 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
pmlmepriv->link_detect_info.num_rx_ok_in_period = 0;
pmlmepriv->link_detect_info.num_tx_ok_in_period = 0;
pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period = 0;
- pmlmepriv->link_detect_info.busy_traffic = bBusyTraffic;
- pmlmepriv->link_detect_info.tx_busy_traffic = bTxBusyTraffic;
- pmlmepriv->link_detect_info.rx_busy_traffic = bRxBusyTraffic;
- pmlmepriv->link_detect_info.higher_busy_traffic = bHigherBusyTraffic;
- pmlmepriv->link_detect_info.higher_busy_rx_traffic = bHigherBusyRxTraffic;
- pmlmepriv->link_detect_info.higher_busy_tx_traffic = bHigherBusyTxTraffic;
-
- return bEnterPS;
+ pmlmepriv->link_detect_info.busy_traffic = busy_traffic;
+ pmlmepriv->link_detect_info.tx_busy_traffic = tx_busy_traffic;
+ pmlmepriv->link_detect_info.rx_busy_traffic = rx_busy_traffic;
+ pmlmepriv->link_detect_info.higher_busy_traffic = higher_busy_traffic;
+ pmlmepriv->link_detect_info.higher_busy_rx_traffic = higher_busy_rx_traffic;
+ pmlmepriv->link_detect_info.higher_busy_tx_traffic = higher_busy_tx_traffic;
+
+ return should_enter_ps;
}
static void dynamic_chk_wk_hdl(struct adapter *padapter)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 944f56b7acf5..45943f832e23 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1643,12 +1643,12 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)
if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode)
&& !(hal_btcoex_IsBtControlLps(adapter))
) {
- u8 bEnterPS;
+ u8 should_enter_ps;
linked_status_chk(adapter);
- bEnterPS = traffic_status_watchdog(adapter, 1);
- if (bEnterPS) {
+ should_enter_ps = traffic_status_watchdog(adapter, 1);
+ if (should_enter_ps) {
/* rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_ENTER, 1); */
rtw_hal_dm_watchdog_in_lps(adapter);
} else {
--
2.52.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v7 4/7] staging: rtl8723bs: remove stale commented code
2026-02-12 14:21 [PATCH v7 0/7] staging: rtl8723bs: coding style and refactoring cleanups Khushal Chitturi
` (2 preceding siblings ...)
2026-02-12 14:21 ` [PATCH v7 3/7] staging: rtl8723bs: convert traffic_status_watchdog() local variables " Khushal Chitturi
@ 2026-02-12 14:21 ` Khushal Chitturi
2026-02-12 14:21 ` [PATCH v7 5/7] staging: rtl8723bs: use bool for traffic_status_watchdog() Khushal Chitturi
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Khushal Chitturi @ 2026-02-12 14:21 UTC (permalink / raw)
To: gregkh
Cc: dan.carpenter, straube.linux, hansg, ethantidmore06,
linux-staging, linux-kernel, Khushal Chitturi
Drop unused commented code left from older versions
Signed-off-by: Khushal Chitturi <khushalchitturi@gmail.com>
---
Changelog:
v6 -> v7: new patch.
drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +-
drivers/staging/rtl8723bs/core/rtw_mlme.c | 1 -
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 1 -
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +-
drivers/staging/rtl8723bs/include/rtw_mlme.h | 1 -
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 1 -
6 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index d6b486fb57ab..5cc11e6c7af6 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -1178,7 +1178,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
pmlmepriv->link_detect_info.traffic_transition_count++;
- if (pmlmepriv->link_detect_info.traffic_transition_count > 30/*TrafficTransitionLevel*/)
+ if (pmlmepriv->link_detect_info.traffic_transition_count > 30)
pmlmepriv->link_detect_info.traffic_transition_count = 30;
}
} else {
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 45943f832e23..3c6278f9ae13 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -2504,7 +2504,6 @@ 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.tx_busy_traffic == false)) */
if (bmcst || (padapter->mlmepriv.link_detect_info.num_tx_ok_in_period < 100))
return;
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 6a85cf9cecfc..8fad375c6a5a 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -4756,7 +4756,6 @@ static void rtw_mlmeext_disconnect(struct adapter *padapter)
timer_delete_sync(&pmlmeext->link_timer);
- /* pmlmepriv->link_detect_info.TrafficBusyState = false; */
pmlmepriv->link_detect_info.traffic_transition_count = 0;
pmlmepriv->link_detect_info.low_power_transition_count = 0;
diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index 15657de5475e..666e241704d9 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -206,7 +206,7 @@ void traffic_check_for_leave_lps(struct adapter *padapter, u8 tx, u32 tx_packets
}
} else { /* from rx path */
- if (pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period > 4/*2*/) {
+ if (pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period > 4) {
if (adapter_to_pwrctl(padapter)->bLeisurePs
&& (adapter_to_pwrctl(padapter)->pwr_mode != PS_MODE_ACTIVE)
&& !(hal_btcoex_IsBtControlLps(padapter)))
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h
index 66d522006dfb..65a9e4e9df55 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h
@@ -102,7 +102,6 @@ struct rt_link_detect_t {
bool higher_busy_traffic; /* For interrupt migration purpose. */
bool higher_busy_rx_traffic; /* We may disable Tx interrupt according as Rx traffic. */
bool higher_busy_tx_traffic; /* We may disable Tx interrupt according as Tx traffic. */
- /* u8 TrafficBusyState; */
u8 traffic_transition_count;
u32 low_power_transition_count;
};
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 953e29ad2c44..8b2e0330082b 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -620,7 +620,6 @@ void rtw_reset_drv_sw(struct adapter *padapter)
pmlmepriv->link_detect_info.busy_traffic = false;
- /* pmlmepriv->link_detect_info.TrafficBusyState = false; */
pmlmepriv->link_detect_info.traffic_transition_count = 0;
pmlmepriv->link_detect_info.low_power_transition_count = 0;
--
2.52.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v7 5/7] staging: rtl8723bs: use bool for traffic_status_watchdog()
2026-02-12 14:21 [PATCH v7 0/7] staging: rtl8723bs: coding style and refactoring cleanups Khushal Chitturi
` (3 preceding siblings ...)
2026-02-12 14:21 ` [PATCH v7 4/7] staging: rtl8723bs: remove stale commented code Khushal Chitturi
@ 2026-02-12 14:21 ` Khushal Chitturi
2026-02-12 14:21 ` [PATCH v7 6/7] staging: rtl8723bs: simplify boolean expressions Khushal Chitturi
2026-02-12 14:21 ` [PATCH v7 7/7] staging: rtl8723bs: align and split variable declarations Khushal Chitturi
6 siblings, 0 replies; 8+ messages in thread
From: Khushal Chitturi @ 2026-02-12 14:21 UTC (permalink / raw)
To: gregkh
Cc: dan.carpenter, straube.linux, hansg, ethantidmore06,
linux-staging, linux-kernel, Khushal Chitturi
This patch changes the return type of traffic_status_watchdog(),
its parameter, and its local variables from u8 to bool as they
represent boolean state.
Signed-off-by: Khushal Chitturi <khushalchitturi@gmail.com>
---
Changelog:
v6 -> v7: Convert from_timer parameter to bool.
v5 -> v6: Add new patch to convert traffic_status_watchdog variables
from u8 to bool
drivers/staging/rtl8723bs/core/rtw_cmd.c | 10 +++++-----
drivers/staging/rtl8723bs/core/rtw_mlme.c | 4 ++--
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index 5cc11e6c7af6..c50a3a2997e2 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -1125,14 +1125,14 @@ static void collect_traffic_statistics(struct adapter *padapter)
pdvobjpriv->traffic_stat.cur_rx_tp = (u32)(pdvobjpriv->traffic_stat.cur_rx_bytes * 8 / 2 / 1024 / 1024);
}
-u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
+bool traffic_status_watchdog(struct adapter *padapter, bool from_timer)
{
- u8 should_enter_ps = false;
+ bool should_enter_ps = false;
u16 busy_threshold_high = 25;
u16 busy_threshold_low = 10;
u16 busy_threshold = busy_threshold_high;
- u8 busy_traffic = false, tx_busy_traffic = false, rx_busy_traffic = false;
- u8 higher_busy_traffic = false, higher_busy_rx_traffic = false, higher_busy_tx_traffic = false;
+ bool busy_traffic = false, tx_busy_traffic = false, rx_busy_traffic = false;
+ bool higher_busy_traffic = false, higher_busy_rx_traffic = false, higher_busy_tx_traffic = false;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
collect_traffic_statistics(padapter);
@@ -1239,7 +1239,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter)
/* if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING|_FW_UNDER_SURVEY) ==false) */
{
linked_status_chk(padapter);
- traffic_status_watchdog(padapter, 0);
+ traffic_status_watchdog(padapter, false);
}
rtw_hal_dm_watchdog(padapter);
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 3c6278f9ae13..56d52fedc2ab 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1643,11 +1643,11 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)
if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode)
&& !(hal_btcoex_IsBtControlLps(adapter))
) {
- u8 should_enter_ps;
+ bool should_enter_ps;
linked_status_chk(adapter);
- should_enter_ps = traffic_status_watchdog(adapter, 1);
+ should_enter_ps = traffic_status_watchdog(adapter, true);
if (should_enter_ps) {
/* rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_ENTER, 1); */
rtw_hal_dm_watchdog_in_lps(adapter);
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
index afa5631a441a..31bb09bc3534 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
@@ -615,7 +615,7 @@ extern 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 u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer);
+extern 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);
--
2.52.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v7 6/7] staging: rtl8723bs: simplify boolean expressions
2026-02-12 14:21 [PATCH v7 0/7] staging: rtl8723bs: coding style and refactoring cleanups Khushal Chitturi
` (4 preceding siblings ...)
2026-02-12 14:21 ` [PATCH v7 5/7] staging: rtl8723bs: use bool for traffic_status_watchdog() Khushal Chitturi
@ 2026-02-12 14:21 ` Khushal Chitturi
2026-02-12 14:21 ` [PATCH v7 7/7] staging: rtl8723bs: align and split variable declarations Khushal Chitturi
6 siblings, 0 replies; 8+ messages in thread
From: Khushal Chitturi @ 2026-02-12 14:21 UTC (permalink / raw)
To: gregkh
Cc: dan.carpenter, straube.linux, hansg, ethantidmore06,
linux-staging, linux-kernel, Khushal Chitturi
Remove redundant comparisons with true/false and simplify
boolean conditions.
Signed-off-by: Khushal Chitturi <khushalchitturi@gmail.com>
---
Changelog:
v6 -> v7: new patch applying boolean simplifications to renamed code.
drivers/staging/rtl8723bs/core/rtw_cmd.c | 9 ++++++---
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 13 +++++--------
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index c50a3a2997e2..f322a7f89b42 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -1150,7 +1150,8 @@ bool traffic_status_watchdog(struct adapter *padapter, bool from_timer)
pmlmepriv->link_detect_info.num_tx_ok_in_period > busy_threshold) {
busy_traffic = true;
- if (pmlmepriv->link_detect_info.num_rx_ok_in_period > pmlmepriv->link_detect_info.num_tx_ok_in_period)
+ if (pmlmepriv->link_detect_info.num_rx_ok_in_period >
+ pmlmepriv->link_detect_info.num_tx_ok_in_period)
rx_busy_traffic = true;
else
tx_busy_traffic = true;
@@ -1161,14 +1162,16 @@ bool traffic_status_watchdog(struct adapter *padapter, bool from_timer)
pmlmepriv->link_detect_info.num_tx_ok_in_period > 4000) {
higher_busy_traffic = true;
- if (pmlmepriv->link_detect_info.num_rx_ok_in_period > pmlmepriv->link_detect_info.num_tx_ok_in_period)
+ if (pmlmepriv->link_detect_info.num_rx_ok_in_period >
+ pmlmepriv->link_detect_info.num_tx_ok_in_period)
higher_busy_rx_traffic = true;
else
higher_busy_tx_traffic = true;
}
/* check traffic for powersaving. */
- if (((pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period + pmlmepriv->link_detect_info.num_tx_ok_in_period) > 8) ||
+ if (((pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period +
+ pmlmepriv->link_detect_info.num_tx_ok_in_period) > 8) ||
(pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period > 2)) {
should_enter_ps = false;
diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index c41595d03c08..d92ec9949d00 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -61,9 +61,7 @@ u8 rtw_do_join(struct adapter *padapter)
/* when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empty */
/* we try to issue sitesurvey firstly */
- if (pmlmepriv->link_detect_info.busy_traffic == false
- || rtw_to_roam(padapter) > 0
- ) {
+ if (!pmlmepriv->link_detect_info.busy_traffic || rtw_to_roam(padapter) > 0) {
/* submit site_survey_cmd */
ret = rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0);
if (ret != _SUCCESS)
@@ -113,9 +111,8 @@ u8 rtw_do_join(struct adapter *padapter)
/* when set_ssid/set_bssid for rtw_do_join(), but there are no desired bss in scanning queue */
/* we try to issue sitesurvey firstly */
- if (pmlmepriv->link_detect_info.busy_traffic == false
- || rtw_to_roam(padapter) > 0
- ) {
+ if (!pmlmepriv->link_detect_info.busy_traffic ||
+ rtw_to_roam(padapter) > 0) {
ret = rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0);
if (ret != _SUCCESS)
pmlmepriv->to_join = false;
@@ -379,8 +376,8 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s
goto exit;
}
- if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) ||
- (pmlmepriv->link_detect_info.busy_traffic == true)) {
+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING) ||
+ pmlmepriv->link_detect_info.busy_traffic) {
/* Scan or linking is in progress, do nothing. */
res = true;
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 983669189d41..f0e423cf7627 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1231,7 +1231,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
goto check_need_indicate_scan_done;
}
- if (pmlmepriv->link_detect_info.busy_traffic == true) {
+ if (pmlmepriv->link_detect_info.busy_traffic) {
static unsigned long lastscantime;
unsigned long passtime;
--
2.52.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v7 7/7] staging: rtl8723bs: align and split variable declarations
2026-02-12 14:21 [PATCH v7 0/7] staging: rtl8723bs: coding style and refactoring cleanups Khushal Chitturi
` (5 preceding siblings ...)
2026-02-12 14:21 ` [PATCH v7 6/7] staging: rtl8723bs: simplify boolean expressions Khushal Chitturi
@ 2026-02-12 14:21 ` Khushal Chitturi
6 siblings, 0 replies; 8+ messages in thread
From: Khushal Chitturi @ 2026-02-12 14:21 UTC (permalink / raw)
To: gregkh
Cc: dan.carpenter, straube.linux, hansg, ethantidmore06,
linux-staging, linux-kernel, Khushal Chitturi
Split multi variable declarations into single lines and move
trailing comments to the line above to fix line length and
alignment warnings.
Signed-off-by: Khushal Chitturi <khushalchitturi@gmail.com>
---
Changelog:
v6 -> v7: New patch to address warnings from earlier refactoring.
drivers/staging/rtl8723bs/core/rtw_cmd.c | 8 ++++++--
drivers/staging/rtl8723bs/include/rtw_mlme.h | 13 ++++++++-----
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index f322a7f89b42..ab669032be40 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -1131,8 +1131,12 @@ bool traffic_status_watchdog(struct adapter *padapter, bool from_timer)
u16 busy_threshold_high = 25;
u16 busy_threshold_low = 10;
u16 busy_threshold = busy_threshold_high;
- bool busy_traffic = false, tx_busy_traffic = false, rx_busy_traffic = false;
- bool higher_busy_traffic = false, higher_busy_rx_traffic = false, higher_busy_tx_traffic = false;
+ bool busy_traffic = false;
+ bool tx_busy_traffic = false;
+ bool rx_busy_traffic = false;
+ bool higher_busy_traffic = false;
+ bool higher_busy_rx_traffic = false;
+ bool higher_busy_tx_traffic = false;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
collect_traffic_statistics(padapter);
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h
index 65a9e4e9df55..cdb2d1dcb728 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h
@@ -99,11 +99,14 @@ struct rt_link_detect_t {
bool busy_traffic;
bool tx_busy_traffic;
bool rx_busy_traffic;
- bool higher_busy_traffic; /* For interrupt migration purpose. */
- bool higher_busy_rx_traffic; /* We may disable Tx interrupt according as Rx traffic. */
- bool higher_busy_tx_traffic; /* We may disable Tx interrupt according as Tx traffic. */
- u8 traffic_transition_count;
- u32 low_power_transition_count;
+ /* For interrupt migration purpose. */
+ bool higher_busy_traffic;
+ /* We may disable Tx interrupt according as Rx traffic. */
+ bool higher_busy_rx_traffic;
+ /* We may disable Tx interrupt according as Tx traffic. */
+ bool higher_busy_tx_traffic;
+ u8 traffic_transition_count;
+ u32 low_power_transition_count;
};
/* used for mlme_priv.roam_flags */
--
2.52.0
^ permalink raw reply related [flat|nested] 8+ messages in thread