staging: rtl8723bs: rename LinkDetectInfo to link_detect_info

Rename LinkDetectInfo to link_detect_info in struct mlme_priv
to follow naming conventions.

Signed-off-by: Khushal Chitturi <khushalchitturi@gmail.com>
Link: https://patch.msgid.link/20260212142131.28131-2-khushalchitturi@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index abb84f8aecbeb021e1686aec6a84331801ba2516..1cff136fa234829f20a84a40dfa607763b243b48 100644 (file)
--- 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 587a87fbffeb4e4670b53266daff529ae6597abf..87fd4b11a7dd2ba7441c56f7dd6079f3d6f2aa51 100644 (file)
--- 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 7df65170838174c91db6493adb935e986f2a4534..b285dc0e5678481fb9ffa44b7352c3c5f4a2a0f7 100644 (file)
--- 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 9037cd1d738fd96e29d8af0d5f30402d91339cac..358354352958aa854e9909c829da2f3b559584d8 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -1513,7 +1513,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;
 }
 
@@ -1565,7 +1565,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;
 
 }
@@ -4758,9 +4758,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 1c9e02732687e160868de9b3ef967737f7c79c75..3122435fa91d76f5b88af40f472e101572637f46 100644 (file)
--- 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 337671b1211f0d18540051f130b9aa3fbe481da6..cb20f2bee0a0348f3be5904d19a5c01b084fea26 100644 (file)
--- 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 7b18be8912e69120e89b6b5b8ed451861a967494..b65b90385109a05e6725f76b080541e86239936a 100644 (file)
--- 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 9105594d2dde06ddd318725eeb97bd6d9507453c..973d2e6a9d6a744a48bab6994b60c96ebe32bfd2 100644 (file)
--- 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 a1f2cbf2cf550d5219c6887f224308dc75da0636..a8d3a3b16c95d18efbe9611e8e91f4e43aadc6c9 100644 (file)
--- 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 2a128568c6df50ff6fe3b3b5ffa2c250697ef611..1659c4b43957189c2ad8e42deb3274f2805be161 100644 (file)
--- 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 5bb1ab55369b0672b47e50a10b9357ce8b9160e1..8da70bbc7a50ed72bee9c999bd2c6377a7302b5f 100644 (file)
--- 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 d333f7d3a96a7ae40f54922eea01c0c6725840ea..6917790dc475229970db149279f0a2e5cbc7656b 100644 (file)
--- 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);