From nobody Sun Feb 8 10:34:05 2026 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4D9E2848B2 for ; Tue, 27 Jan 2026 20:04:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769544292; cv=none; b=LeazBYkT4xvLE1n7XEzr73oHzHtk2HUEwfuiIdJAkYwhFhcQEUFCg7XxNO7KRdT2w/6VNMmdUvDcbzYGCE/KmtABkS6U6FDNE8+eQ6gdIIhDWfMYjR3oj+rOE+IypblYZxn/LLPWa1eqhv3iFdSpIx4tWxmAX8Z9Oa+KKC8KmlM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769544292; c=relaxed/simple; bh=iiEpqBynb5Dqs0OFPTT2ePdjz8CI+40vNlKNuYrUvUs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hn3yu+1+Ldc+cO6vm3729CmgiQzkOe/FQ2ncHvpd/FKuM8F6oFPAn34f5CuBMpbUlO+XF2xYc7qVBdCcYFhgrdmiEYQne46UpqCI3yOmbBx/Fm20RT4Y7M93iRTOoZz2X9iPuNygcXEPlqoH3bMeWX1abHrbT7PzJJ3X8KSa5yI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Jg9Sv+d1; arc=none smtp.client-ip=209.85.210.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Jg9Sv+d1" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-81e8a9d521dso3585724b3a.2 for ; Tue, 27 Jan 2026 12:04:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769544290; x=1770149090; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=44FJ2lRoW81kO/4ElkNFmQLs9545Q+Fh1IjM7HnIq0k=; b=Jg9Sv+d1u7bRLFU9g5kWrOix6o1PCBlHzJWvRq3Pt1RjcGLd+zVkcAtJwG288U6++n inGVUdgPnslEj2m2ySCJLAqXKaBiNp7N/s7bB5tRrgIDGDx/bRrbT0QIHXceC3pf7/TB pxStNFRBm5nPFplAGOBgerSliSDFOQTM0ExrFQBDAPNPDpM4V3cYS49AKIAWTY3SpX+8 TStvzBb4Hin2THIvCv4x/Ja6cVOilkEnOUjaZ5JH5SUCw4oJrAmRqL5me2jmxGJPPm3i 5fWoe/fXp+sXax4PuPk30vn1Pf7BFo3WQW7pC52/wBKScqz9SYmb7eesCvtwo2K4qH06 T/IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769544290; x=1770149090; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=44FJ2lRoW81kO/4ElkNFmQLs9545Q+Fh1IjM7HnIq0k=; b=gko2anMX/O25ND1iiD+AwsT20dny42R1bhRG0hFAblYS9JCJhg2C0oER834taoDTSl tp82Lpi13+hNzq/HlRf8BHoYZ+66UfyteHXDESr9dFEobblSQoLpQkCaS7moaUBtz+Yp rzqiUZ25otVgHBZZQl82t71NpvGCOA91elu0hpJL91l41Wt0mH1zos4qjvW5sjqeZrVr 59cB1AqlJ0GFbdo0os+GJh0TWrEJFlJrEmFK92Cs+reMW9OHTigCV1lR+R1tWenT5jbs HlO3NWaC+GJwVFijTuioAvTnJsRI30FB4934kjIjFsrxO9Px8oaeuFluujn1HfLnseYZ ru/w== X-Forwarded-Encrypted: i=1; AJvYcCUTPGscu4CnVko8LGXwpzSbnqwzEQ4DRzAI9pZoG9YkjTIsJmK7kQ7qGe0W+O63vVAF2X7LGZHkk9RAWhA=@vger.kernel.org X-Gm-Message-State: AOJu0YyNt8azstWPp7ZN+WJD2rZlFwQPS2yKk1U8dUOgrDlt1810qBzw pGBfjGtUEIFclmeoszC6AXkFRJrQFUaDUSeo+U3EjcgT8FEVZ7Kzyo/m X-Gm-Gg: AZuq6aJkX5XNFj5YYkSfXMdXXlyIWNzwVMA2uE0feKwZtfCthrGhaRsBgvfCr4cV1Xc 8pXHCpLWAzJco9SGt0KC/ccl3TSsC/wbuZ3nnRFnRRFw5Sr2ckD+6dvJI2uzKte3lBlw5OaKQW5 phw3pgRYoP8ohCnMGGMfn3u4jGA2sFhw9Wlqf8aQhlceGS3kWD29SmTtdArHGcWpvd0ncdD7qVt IAd9vn2pTDBfFXhsbVChRG/YAtDGBPmdwDSzYoCD1cR68oIpjmQ9I12R1QZoP81d6yBi8h7eSY3 xizknWwoQ7cIzlRnwpLe+cNql6SmUBaBsDGnpfu3+q4TulCVv/v43n19ViALwcSuZzoxmNPmZnW MFEaBcopDsqR9131YyqVMsT0fMmPf3TVi5ovyIGEyh8nFA7FGuVHSIsXwTWjm4eCvTku9EdRWti h61Tk4sCwMwZadsBiG/iqDgdOfJcE= X-Received: by 2002:a05:6a00:b95:b0:81c:717b:9d2f with SMTP id d2e1a72fcca58-8236914658fmr2970117b3a.5.1769544289940; Tue, 27 Jan 2026 12:04:49 -0800 (PST) Received: from snowman ([2401:4900:646d:9a6e:84d0:c92:d353:cd21]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82379b59e10sm377771b3a.25.2026.01.27.12.04.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jan 2026 12:04:49 -0800 (PST) From: Khushal Chitturi To: gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, straube.linux@gmail.com, hansg@kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Khushal Chitturi Subject: [PATCH v5 2/3] staging: rtl8723bs: rename LinkDetectInfo and clean up related code Date: Wed, 28 Jan 2026 01:34:26 +0530 Message-ID: <20260127200427.3669-3-khushalchitturi@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260127200427.3669-1-khushalchitturi@gmail.com> References: <20260127200427.3669-1-khushalchitturi@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch renames LinkDetectInfo instance to link_detect_info and updates the fields of rt_link_detect_t to follow kernel naming conventions. Local variables in traffic_status_watchdog were also updated for consistency. Related checkpatch.pl warnings triggered by the rename were also fixed. Signed-off-by: Khushal Chitturi --- Changelog: 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 | 103 ++++++++++-------- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 15 +-- drivers/staging/rtl8723bs/core/rtw_mlme.c | 16 +-- 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 | 6 +- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 4 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 31 ++++-- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 8 +- 12 files changed, 108 insertions(+), 95 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index 27da987d881f..64d98761cdf3 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -1130,12 +1130,16 @@ static void collect_traffic_statistics(struct adapt= er *padapter) =20 u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer) { - u8 bEnterPS =3D false; - u16 BusyThresholdHigh =3D 25; - u16 BusyThresholdLow =3D 10; - u16 BusyThreshold =3D BusyThresholdHigh; - u8 bBusyTraffic =3D false, bTxBusyTraffic =3D false, bRxBusyTraffic =3D f= alse; - u8 bHigherBusyTraffic =3D false, bHigherBusyRxTraffic =3D false, bHigherB= usyTxTraffic =3D false; + bool should_enter_ps =3D false; + u16 busy_threshold_high =3D 25; + u16 busy_threshold_low =3D 10; + u16 busy_threshold =3D busy_threshold_high; + bool busy_traffic =3D false; + bool tx_busy_traffic =3D false; + bool rx_busy_traffic =3D false; + bool higher_busy_traffic =3D false; + bool higher_busy_rx_traffic =3D false; + bool higher_busy_tx_traffic =3D false; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 collect_traffic_statistics(padapter); @@ -1145,57 +1149,61 @@ 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) - BusyThreshold =3D BusyThresholdLow; + /* if we raise busy_traffic in last watchdog, using lower threshold. */ + if (pmlmepriv->link_detect_info.busy_traffic) + busy_threshold =3D busy_threshold_low; =20 - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold) { - bBusyTraffic =3D 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 =3D true; =20 - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectIn= fo.NumTxOkInPeriod) - bRxBusyTraffic =3D true; + if (pmlmepriv->link_detect_info.num_rx_ok_in_period > + pmlmepriv->link_detect_info.num_tx_ok_in_period) + rx_busy_traffic =3D true; else - bTxBusyTraffic =3D true; + tx_busy_traffic =3D true; } =20 /* Higher Tx/Rx data. */ - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 4000 || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 4000) { - bHigherBusyTraffic =3D true; + if (pmlmepriv->link_detect_info.num_rx_ok_in_period > 4000 || + pmlmepriv->link_detect_info.num_tx_ok_in_period > 4000) { + higher_busy_traffic =3D true; =20 - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectIn= fo.NumTxOkInPeriod) - bHigherBusyRxTraffic =3D true; + if (pmlmepriv->link_detect_info.num_rx_ok_in_period > + pmlmepriv->link_detect_info.num_tx_ok_in_period) + higher_busy_rx_traffic =3D true; else - bHigherBusyTxTraffic =3D true; + higher_busy_tx_traffic =3D true; } =20 /* check traffic for powersaving. */ - if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->Link= DetectInfo.NumTxOkInPeriod) > 8) || - (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) { - bEnterPS =3D false; + 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 =3D false; =20 - if (bBusyTraffic) { - if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount <=3D 4) - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 4; + if (busy_traffic) { + if (pmlmepriv->link_detect_info.traffic_transition_count <=3D 4) + pmlmepriv->link_detect_info.traffic_transition_count =3D 4; =20 - pmlmepriv->LinkDetectInfo.TrafficTransitionCount++; + pmlmepriv->link_detect_info.traffic_transition_count++; =20 - if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount > 30/*TrafficTran= sitionLevel*/) - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 30; + /* Check if traffic transition count exceeds the threshold */ + if (pmlmepriv->link_detect_info.traffic_transition_count > 30) + pmlmepriv->link_detect_info.traffic_transition_count =3D 30; } } else { - if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount >=3D 2) - pmlmepriv->LinkDetectInfo.TrafficTransitionCount -=3D 2; + if (pmlmepriv->link_detect_info.traffic_transition_count >=3D 2) + pmlmepriv->link_detect_info.traffic_transition_count -=3D 2; else - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 0; + pmlmepriv->link_detect_info.traffic_transition_count =3D 0; =20 - if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D=3D 0) - bEnterPS =3D true; + if (pmlmepriv->link_detect_info.traffic_transition_count =3D=3D 0) + should_enter_ps =3D true; } =20 /* LeisurePS only work in infra mode. */ - if (bEnterPS) { + if (should_enter_ps) { if (!from_timer) LPS_Enter(padapter, "TRAFFIC_IDLE"); } else { @@ -1215,17 +1223,18 @@ u8 traffic_status_watchdog(struct adapter *padapter= , u8 from_timer) LPS_Leave(padapter, "NON_LINKED"); } =20 - pmlmepriv->LinkDetectInfo.NumRxOkInPeriod =3D 0; - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod =3D 0; - pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod =3D 0; - pmlmepriv->LinkDetectInfo.bBusyTraffic =3D bBusyTraffic; - pmlmepriv->LinkDetectInfo.bTxBusyTraffic =3D bTxBusyTraffic; - pmlmepriv->LinkDetectInfo.bRxBusyTraffic =3D bRxBusyTraffic; - pmlmepriv->LinkDetectInfo.bHigherBusyTraffic =3D bHigherBusyTraffic; - pmlmepriv->LinkDetectInfo.bHigherBusyRxTraffic =3D bHigherBusyRxTraffic; - pmlmepriv->LinkDetectInfo.bHigherBusyTxTraffic =3D bHigherBusyTxTraffic; - - return bEnterPS; + pmlmepriv->link_detect_info.num_rx_ok_in_period =3D 0; + pmlmepriv->link_detect_info.num_tx_ok_in_period =3D 0; + pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period =3D 0; + pmlmepriv->link_detect_info.busy_traffic =3D busy_traffic; + pmlmepriv->link_detect_info.tx_busy_traffic =3D tx_busy_traffic; + pmlmepriv->link_detect_info.rx_busy_traffic =3D rx_busy_traffic; + pmlmepriv->link_detect_info.higher_busy_traffic =3D higher_busy_traffic; + pmlmepriv->link_detect_info.higher_busy_rx_traffic =3D higher_busy_rx_tra= ffic; + pmlmepriv->link_detect_info.higher_busy_tx_traffic =3D higher_busy_tx_tra= ffic; + + return should_enter_ps; + } =20 static void dynamic_chk_wk_hdl(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/stagi= ng/rtl8723bs/core/rtw_ioctl_set.c index 587a87fbffeb..b190cb1392a0 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 empt= y */ /* we try to issue sitesurvey firstly */ =20 - if (pmlmepriv->LinkDetectInfo.bBusyTraffic =3D=3D false - || rtw_to_roam(padapter) > 0 - ) { + if (!pmlmepriv->link_detect_info.busy_traffic || rtw_to_roam(padapter) >= 0) { /* submit site_survey_cmd */ ret =3D rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0= ); if (ret !=3D _SUCCESS) @@ -113,9 +111,8 @@ u8 rtw_do_join(struct adapter *padapter) =20 /* 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 =3D=3D false - || rtw_to_roam(padapter) > 0 - ) { + if (!pmlmepriv->link_detect_info.busy_traffic || + rtw_to_roam(padapter) > 0) { ret =3D rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL,= 0); if (ret !=3D _SUCCESS) pmlmepriv->to_join =3D false; @@ -374,13 +371,13 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *pad= apter, struct ndis_802_11_s res =3D false; goto exit; } - if (padapter->hw_init_completed =3D=3D false) { + if (!padapter->hw_init_completed) { res =3D false; goto exit; } =20 - if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) =3D=3D = true) || - (pmlmepriv->LinkDetectInfo.bBusyTraffic =3D=3D 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 =3D true; =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 8e1e1c97f0c4..459f19e3b7fe 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1185,8 +1185,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) =20 spin_lock_bh(&pmlmepriv->lock); =20 - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 0; - pmlmepriv->LinkDetectInfo.LowPowerTransitionCount =3D 0; + pmlmepriv->link_detect_info.traffic_transition_count =3D 0; + pmlmepriv->link_detect_info.low_power_transition_count =3D 0; =20 if (pnetwork->join_res > 0) { spin_lock_bh(&pmlmepriv->scanned_queue.lock); @@ -1627,7 +1627,7 @@ static void rtw_auto_scan_handler(struct adapter *pad= apter) if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) goto exit; =20 - if (pmlmepriv->LinkDetectInfo.bBusyTraffic) + if (pmlmepriv->link_detect_info.busy_traffic) goto exit; } =20 @@ -1655,12 +1655,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; + bool should_enter_ps; =20 linked_status_chk(adapter); =20 - bEnterPS =3D traffic_status_watchdog(adapter, 1); - if (bEnterPS) { + should_enter_ps =3D 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 { @@ -2517,8 +2517,8 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter,= struct xmit_frame *pxmitfr struct pkt_attrib *pattrib =3D &pxmitframe->attrib; s32 bmcst =3D is_multicast_ether_addr(pattrib->ra); =20 - /* if (bmcst || (padapter->mlmepriv.LinkDetectInfo.bTxBusyTraffic =3D=3D = false)) */ - if (bmcst || (padapter->mlmepriv.LinkDetectInfo.NumTxOkInPeriod < 100)) + /* if (bmcst || (padapter->mlmepriv.link_detect_info.tx_busy_traffic =3D= =3D false)) */ + if (bmcst || (padapter->mlmepriv.link_detect_info.num_tx_ok_in_period < 1= 00)) return; =20 priority =3D pattrib->priority; diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 884fcce50d9c..8eafb929938c 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -1522,7 +1522,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union= recv_frame *precv_frame) if (ignore_received_deauth =3D=3D 0) receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); =20 - pmlmepriv->LinkDetectInfo.bBusyTraffic =3D false; + pmlmepriv->link_detect_info.busy_traffic =3D false; return _SUCCESS; } =20 @@ -1574,7 +1574,7 @@ unsigned int OnDisassoc(struct adapter *padapter, uni= on recv_frame *precv_frame) =20 receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); =20 - pmlmepriv->LinkDetectInfo.bBusyTraffic =3D false; + pmlmepriv->link_detect_info.busy_traffic =3D false; return _SUCCESS; =20 } @@ -4776,9 +4776,9 @@ static void rtw_mlmeext_disconnect(struct adapter *pa= dapter) =20 timer_delete_sync(&pmlmeext->link_timer); =20 - /* pmlmepriv->LinkDetectInfo.TrafficBusyState =3D false; */ - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 0; - pmlmepriv->LinkDetectInfo.LowPowerTransitionCount =3D 0; + /* pmlmepriv->link_detect_info.TrafficBusyState =3D false; */ + pmlmepriv->link_detect_info.traffic_transition_count =3D 0; + pmlmepriv->link_detect_info.low_power_transition_count =3D 0; =20 } =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging= /rtl8723bs/core/rtw_pwrctrl.c index 0ef788abf403..5fab7b32d4d4 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -210,7 +210,7 @@ void traffic_check_for_leave_lps(struct adapter *padapt= er, u8 tx, u32 tx_packets } =20 } else { /* from rx path */ - if (pmlmepriv->LinkDetectInfo.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 !=3D PS_MODE_ACTIVE) && !(hal_btcoex_IsBtControlLps(padapter))) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index 0a8725686721..80d0c5884a2a 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 =3D get_recvframe_len(prframe); precvpriv->rx_bytes +=3D sz; =20 - padapter->mlmepriv.LinkDetectInfo.NumRxOkInPeriod++; + padapter->mlmepriv.link_detect_info.num_rx_ok_in_period++; =20 if ((!is_broadcast_ether_addr(pattrib->dst)) && (!is_multicast_ether_addr= (pattrib->dst))) - padapter->mlmepriv.LinkDetectInfo.NumRxUnicastOkInPeriod++; + padapter->mlmepriv.link_detect_info.num_rx_unicast_ok_in_period++; =20 if (sta) psta =3D sta; diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index 314027ea79a4..06537f21bbe6 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -1392,7 +1392,7 @@ void rtw_count_tx_stats(struct adapter *padapter, str= uct xmit_frame *pxmitframe, if ((pxmitframe->frame_tag & 0x0f) =3D=3D DATA_FRAMETAG) { pkt_num =3D pxmitframe->agg_num; =20 - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod +=3D pkt_num; + pmlmepriv->link_detect_info.num_tx_ok_in_period +=3D pkt_num; =20 pxmitpriv->tx_pkts +=3D pkt_num; =20 diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/r= tl8723bs/hal/hal_btcoex.c index 9105594d2dde..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 *padap= ter) if (check_fwstate(pmlmepriv, WIFI_ASOC_STATE) =3D=3D true) { if (check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D true) return true; - if (pmlmepriv->LinkDetectInfo.bBusyTraffic) + if (pmlmepriv->link_detect_info.busy_traffic) return true; } =20 @@ -364,9 +364,9 @@ static u8 halbtcoutsrc_Get(void *pBtcContext, u8 getTyp= e, void *pOutBuf) case BTC_GET_U4_WIFI_TRAFFIC_DIRECTION: { struct rt_link_detect_t *plinkinfo; - plinkinfo =3D &padapter->mlmepriv.LinkDetectInfo; + plinkinfo =3D &padapter->mlmepriv.link_detect_info; =20 - if (plinkinfo->NumTxOkInPeriod > plinkinfo->NumRxOkInPeriod) + if (plinkinfo->num_tx_ok_in_period > plinkinfo->num_rx_ok_in_period) *pU4Tmp =3D BTC_WIFI_TRAFFIC_TX; else *pU4Tmp =3D BTC_WIFI_TRAFFIC_RX; diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_xmit.c index 33c23b80e11b..32533a748f4d 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, st= ruct xmit_priv *pxmitpriv =20 if ( (check_pending_xmitbuf(pxmitpriv)) && - (padapter->mlmepriv.LinkDetectInfo.bHigherBusyTxTraffic) + (padapter->mlmepriv.link_detect_info.higher_busy_tx_traffic) ) { if ((phwxmit->accnt > 0) && (phwxmit->accnt < 5)) { err =3D -2; @@ -482,7 +482,7 @@ s32 rtl8723bs_hal_xmit( (pxmitframe->attrib.ether_type !=3D 0x888e) && (pxmitframe->attrib.dhcp_pkt !=3D 1) ) { - if (padapter->mlmepriv.LinkDetectInfo.bBusyTraffic) + if (padapter->mlmepriv.link_detect_info.busy_traffic) rtw_issue_addbareq_cmd(padapter, pxmitframe); } =20 diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging= /rtl8723bs/include/rtw_mlme.h index 2a128568c6df..3cec80135fcd 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -93,18 +93,25 @@ struct sitesurvey_ctrl { }; =20 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; + + /* 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 TrafficBusyState; */ - u8 TrafficTransitionCount; - u32 LowPowerTransitionCount; + u8 traffic_transition_count; + u32 low_power_transition_count; }; =20 /* used for mlme_priv.roam_flags */ @@ -171,7 +178,7 @@ struct mlme_priv { =20 struct ht_priv htpriv; =20 - struct rt_link_detect_t LinkDetectInfo; + struct rt_link_detect_t link_detect_info; struct timer_list dynamic_chk_timer; /* dynamic/periodic check timer */ =20 u8 acm_mask; /* for wmm acm mask */ diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index 476ab055e53e..5a82279fa681 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -1232,7 +1232,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy goto check_need_indicate_scan_done; } =20 - if (pmlmepriv->LinkDetectInfo.bBusyTraffic =3D=3D true) { + if (pmlmepriv->link_detect_info.busy_traffic) { static unsigned long lastscantime; unsigned long passtime; =20 diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/= rtl8723bs/os_dep/os_intfs.c index f7f23d1b1709..eb1186e69bdf 100644 --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c @@ -606,11 +606,11 @@ void rtw_reset_drv_sw(struct adapter *padapter) padapter->xmitpriv.tx_pkts =3D 0; padapter->recvpriv.rx_pkts =3D 0; =20 - pmlmepriv->LinkDetectInfo.bBusyTraffic =3D false; + pmlmepriv->link_detect_info.busy_traffic =3D false; =20 - /* pmlmepriv->LinkDetectInfo.TrafficBusyState =3D false; */ - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 0; - pmlmepriv->LinkDetectInfo.LowPowerTransitionCount =3D 0; + /* pmlmepriv->link_detect_info.TrafficBusyState =3D false; */ + pmlmepriv->link_detect_info.traffic_transition_count =3D 0; + pmlmepriv->link_detect_info.low_power_transition_count =3D 0; =20 _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING); =20 --=20 2.52.0