[PATCH v7 2/7] staging: rtl8723bs: rename rt_link_detect_t fields to snake_case
From: Khushal Chitturi
Date: Thu Feb 12 2026 - 09:22:12 EST
Convert the CamelCase field names in struct rt_link_detect_t to
snake_case to follow naming conventions.
Signed-off-by: Khushal Chitturi <khushalchitturi@xxxxxxxxx>
---
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