From nobody Sat Feb 7 11:05:04 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 5D2A426A0DD for ; Sun, 1 Feb 2026 11:40:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769946008; cv=none; b=NxLtfswYefLJ0Q76ussXIPhYxoioQD6pTR/myhilBu3djO9PFqnHXveniLKiAcDu9SXqj7ZRwkjLZj4TLwc6jTz8pKBfcXNv77c3gfNRoaacFA53r8YTpl9CjZG+qkuJO2D19Ks0fSA0DPngbgK4TgqChV7npD8AugQ0xcFllbA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769946008; c=relaxed/simple; bh=VEHWnhCA10zhkeR+z57FtlFd2ORb+BmxNw9eSGSvMlM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f94d4gKqgfl0V9H19XEhvteald3eI6atiUTMYzAhdPpMhX261U2Z2D6uU34hPet4fru8R1p0eMmHwNRgqf2pq+g395S0Isxg4WMe9atSHzYgPsqk2IHS31KcCN+PvLbr5npqy7ShXh5JwisMAI7FQTQU7+gVRpULjnOCLrjnwjQ= 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=Uns/zYb1; arc=none smtp.client-ip=209.85.214.182 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="Uns/zYb1" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2a0d67f1877so23102325ad.2 for ; Sun, 01 Feb 2026 03:40:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769946006; x=1770550806; 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=PD1fbwC7X28JWcq9LUMH7rbyJ5ZFLhr2C6Ozi6G/pog=; b=Uns/zYb1Kb1t/9R+XE+UR1xvQ1pe+IdXByi5v7sjJ5Rv81aZQIpmi1ty/9/zHTYtKQ F8GNg4l+sLDKMdee4gMEbc4N99faRk+viJcfwfwWSucra3qtKlcawolUoI6PD/pfEHQJ 8g8L38M0N5eMh0SD0FCn3KVtLZ3C7Ot6Az7VDCARuJcgM6yucRm72R/y23eXmNRYRG8L LgJltwTdHPe07UmzWQsaiKzpyz0ZPIcDu1vMRKW8D4RjieWlYKhlp/PrbN19pNrICh7a n5pOte0Hy9TpLIgMdzJu86uQDDfAKQvKLdich1FsgdS+FoPnMRO/+stHAKkdpYAkctUH NRXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769946006; x=1770550806; 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=PD1fbwC7X28JWcq9LUMH7rbyJ5ZFLhr2C6Ozi6G/pog=; b=mw/K4Nb/kzRhDWEUC+5O2SmMwBWEJLHA59WpXKrDd8Oa1JtgXh1ulBg07v8Q3ZjufA cocayjyA+T7CzHQFNRYHrpusHQE13TGdf5BQOLgoFo+EBKO6+Dv/QI5093UW08bwOmpn BLtp1WryQA93JnHGiI6yqHWqXjOw+NGZ8uSJZyE3EYsgwTXvukoTj/jZyiw3V11Y5yHX I6Glc4vmYCNa3briqwEg+7PYvMYod5K1cbZJ9HDxQBqLl25e9ml01yBfRfR5wczzNj8q tvKl+QQEqERfxSyXE97GZbGy8Q888rTuJqDg0fU+1t/xr6CmB8JXgXi2t4BIthH1I9fu tunQ== X-Forwarded-Encrypted: i=1; AJvYcCUo1X2ZAzwUf5x/MmFTVPNemDbiAPbniylhObrNc1fBZaos+giXpwJrSTwzxrGOv/Ef/cFGCTQkaAmaXL0=@vger.kernel.org X-Gm-Message-State: AOJu0YwDMoqvQhwdYhYA7vBLYAxJLGWpc6fOcysbRqAYdOOcZqR0BgIh OU+jFLog5hyI6BnVrwIcFizS2vImmk7DDH2AGY9Z7483V4S7CTP77ufq X-Gm-Gg: AZuq6aJSFmcC1GhFjjKNM0Lzg5Gi4CBmKAtuJ5LCb0PnEm0b6+AvEKAjW/2mymrtorp 4v23+JUY6njkIxt/gIp9ld+R8sNyJ9Dhteru9E5ko/ITQK9QTR60AVS2mfgzv41xyijCKSMGwQc hPzxNYZ+hyo6WkZO1m/m0hagJyTTT39W7xNdVJuLpNYXtxrbiniuPKVeWJ/HGA80ylaYL5qMsO0 V3WTnj4pmnVqMw4Y1H5vF051ERNYr59PDXCEfNeZq2TY/vJpKIYY4SwwoQwyfNZHOMFSKYViB0Q B8hCTvYve4gbHredOT01ZakaClnC3QdH4lqaO0BNbIY42tYb8xmVSSsEhouOTejxVXenVKXw6EP nT92ksSuPxiGpMwfv7u05/DvkyGSgNHoML8uV6GBh5Wxxy43+XatdwFm2vKn+ufOCdSu+q8pLSP qDi4uRvLYHpNQ+qSOirCnpfn2+VF4= X-Received: by 2002:a17:902:da90:b0:29e:a615:f508 with SMTP id d9443c01a7336-2a8d803819bmr86319955ad.28.1769946005565; Sun, 01 Feb 2026 03:40:05 -0800 (PST) Received: from snowman ([2401:4900:614d:8c00:9d3:b11e:236d:377a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b7f7caasm121156675ad.101.2026.02.01.03.39.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Feb 2026 03:40:04 -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 v6 1/4] staging: rtl8723bs: rename LinkDetectInfo and clean up related code Date: Sun, 1 Feb 2026 17:08:34 +0530 Message-ID: <20260201113837.8531-2-khushalchitturi@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260201113837.8531-1-khushalchitturi@gmail.com> References: <20260201113837.8531-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 update the fields of rt_link_detect_t to follow kernel naming conventions. Local variables in traffic_status_watchdog were also updated for consistency. Signed-off-by: Khushal Chitturi --- Changelog: v5 -> v6: Limited the changes to LinkDetectInfo renaming. 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 | 102 ++++++++++-------- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 9 +- 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, 105 insertions(+), 91 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index 27da987d881f..ab3c7d3846b5 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; + u8 should_enter_ps =3D false; + u16 busy_threshold_high =3D 25; + u16 busy_threshold_low =3D 10; + u16 busy_threshold =3D busy_threshold_high; + u8 busy_traffic =3D false; + u8 tx_busy_traffic =3D false; + u8 rx_busy_traffic =3D false; + u8 higher_busy_traffic =3D false; + u8 higher_busy_rx_traffic =3D false; + u8 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,17 @@ 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..2d37ac4c50ef 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 empt= y */ /* we try to issue sitesurvey firstly */ =20 - if (pmlmepriv->LinkDetectInfo.bBusyTraffic =3D=3D false + if (pmlmepriv->link_detect_info.busy_traffic =3D=3D false || rtw_to_roam(padapter) > 0 ) { /* submit site_survey_cmd */ @@ -113,9 +113,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 =3D=3D false || + 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; @@ -380,7 +379,7 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padap= ter, struct ndis_802_11_s } =20 if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) =3D=3D = true) || - (pmlmepriv->LinkDetectInfo.bBusyTraffic =3D=3D true)) { + (pmlmepriv->link_detect_info.busy_traffic =3D=3D true)) { /* 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..4088a1aaae3c 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; + u8 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 < 10= 0) 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 9cead1455bfa..bff8f8e76a63 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -1390,7 +1390,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..62b249cc23ef 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 =3D=3D true) { 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 From nobody Sat Feb 7 11:05:04 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 98B1732B997 for ; Sun, 1 Feb 2026 11:40:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769946016; cv=none; b=dzeuzyMrEPUrKjDA+zwZoMGN/b0bg1fwoOFfmwmBNC49iXXO28WbisVSB4Ud7KWG9Hagwo5/2Ml6o388nLscblsN2C+JqBxp45HaASG0DAUv02T5kgsazczX0cIpOl4bJUIIrRQiNxhVg4lm9+/aQjiCDQeHyxXRenVbK3Edb90= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769946016; c=relaxed/simple; bh=qe8eFPgsqvNqJ6QDx27xR0PTuugEHIEOKSmTEkT8Kog=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VBdyjlhb976qNQVKKtR5slXM6Eklt4KsdgddMaEbsfXgC4YI+oYU94IQpdNhxYbT6KfZskpfzlvohjJhpC75JJM86/tvaX2+R4RNsGAstPm+k4AsTvRsOGBAXDSOYe0T51gzRAs+bzHdrDEB3L3ek0vx7eNtcjvm3n1J05ihCNU= 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=LMdRxx4X; arc=none smtp.client-ip=209.85.214.176 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="LMdRxx4X" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2a8a7269547so33720515ad.0 for ; Sun, 01 Feb 2026 03:40:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769946015; x=1770550815; 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=cwpTkEgA8CYzigtWuNHN2tV3pXmflhzy9Fi92GAaHfE=; b=LMdRxx4XctvFek3lcj2aFQxbzgQxP8Ft/2D4wCIHwl2J6PeZ3YhpC37EyySyXm9usw LwmEmYCND8wNY9rcdeLeiTm4Nt/c6Jpv3IbHA9R3KjKIlyw/K2IKO85cUNXRXocG26W1 Ej6sjTu52YKz6vZypMZPniNodigmOGTNJ5U9l0EgS+/Kyyn0UiUbFQ1rfU2YbG3agYFU 3/ISamYAV1I5HznDteakIKTAOBXkH5Tuh8XJMFqdkRrZ80PHbh/WTJoZ9FdJvj2xJiiT DEhsrTDH7QLQPvjvTZ1JP46EFK3q8ViIBMjr46v58VZWfTUDAy/QH5vRNQm3FtzIt/5s 1UDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769946015; x=1770550815; 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=cwpTkEgA8CYzigtWuNHN2tV3pXmflhzy9Fi92GAaHfE=; b=tIXZ/oWDrhKempvD16ujP6MT0WbOL52v5/cCGliPhEOdM/Z5lhxKESQM6KsF+U6ei/ lP0kC/9L8QaCJTL7139b6DUqOpKCa6tkqAgJiB9uAeBmTC8cI2T8v3fhvVNxGRCenv5u pNoC6Rz/o4WoVHF3+G18LrNL1PULWfyE2hZKGUVDnmC4P+AY5NYIM/3rRanSDUFwETOz miztpx7vkCQ3GJQMsQR5KYsLosTRGyy0ZwXezz0sh43USm7+MTHequOBIEcqQP5x+Kum i1dr67Yt8KoaicGVr2VoOg9QA0bdTXgRVBFxHVHQQzI5QM4xmG2KQTcJ7FOgQUXPQ8lf JXAA== X-Forwarded-Encrypted: i=1; AJvYcCU8ilETYP09y74pSZ2eHIiiqB6JVx6O/xxCD6+uBM0nXmJ14M8yNGn8DQFrZKIytv5DsrXBiuuN7abjkEs=@vger.kernel.org X-Gm-Message-State: AOJu0YxZBWluKZE1T42GhWhIz2kftyA1jlt/fKMLFdoKwJBe4i8+u0YY mMfZMtiCxk7YpdyEAjyVLBqedn+gTeAKJsHUNnLOYqUWUhsRGtvkmqiP X-Gm-Gg: AZuq6aK/rHNJtaLvjZj7elcQP2/zryNs+EScLDFtGTZS/HxbGgHsW6C+n4X1LnsJFiE jFaA0NX4nelaLjC5CnpAv8STtaU9bf1oXEoG4AzTQsRir9v4tdE4SMQkg7hZ8Ha/8aLyCL/hwz7 WD/NO0yabRomgSQYZBZeNcKZ5e+3vedOVKU+DR1iOSGhXZ08xVlWkUF3bIACbsn0O/RfCPV0y8W Ile0V3mPCElRlBLCgbobVZgyBC36XJ2CGIfPDKpFPHoF6EFCJsmbhf5amsXBO/OqGDl/yjaE8NL eoKmeWDkEA6rDroYwBJVcSCAvF7aUvDRyX+peBNx0t2mARK54PcGEdsODifR/SQs39szg7ytqgn HNqHszRtMOSDjf22ny2S6uvAJYUF8wXGJ43LxvYOjIa45QTRbDpRWvLQdvdPbi1X2ckH1qHgnFP dewahR/PxIhDoxMkcg X-Received: by 2002:a17:903:2f91:b0:2a8:d9ea:8b59 with SMTP id d9443c01a7336-2a8d9ea8ce0mr93715345ad.7.1769946014987; Sun, 01 Feb 2026 03:40:14 -0800 (PST) Received: from snowman ([2401:4900:614d:8c00:9d3:b11e:236d:377a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b7f7caasm121156675ad.101.2026.02.01.03.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Feb 2026 03:40:14 -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 v6 2/4] staging: rtl8723bs: convert traffic status variables to bool Date: Sun, 1 Feb 2026 17:08:35 +0530 Message-ID: <20260201113837.8531-3-khushalchitturi@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260201113837.8531-1-khushalchitturi@gmail.com> References: <20260201113837.8531-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 replaces u8 variables in traffic_status_watchdog() and its callers with bool to reflect their usage. Signed-off-by: Khushal Chitturi --- Changelog: v5 -> v6: Add new patch to convert traffic_status_watchdog variables from u8 to bool drivers/staging/rtl8723bs/core/rtw_cmd.c | 16 ++++++++-------- drivers/staging/rtl8723bs/core/rtw_mlme.c | 7 +++---- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index ab3c7d3846b5..a8254616cd36 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -1128,18 +1128,18 @@ static void collect_traffic_statistics(struct adapt= er *padapter) pdvobjpriv->traffic_stat.cur_rx_tp =3D (u32)(pdvobjpriv->traffic_stat.cur= _rx_bytes * 8 / 2 / 1024 / 1024); } =20 -u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer) +bool traffic_status_watchdog(struct adapter *padapter, u8 from_timer) { - u8 should_enter_ps =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; - u8 busy_traffic =3D false; - u8 tx_busy_traffic =3D false; - u8 rx_busy_traffic =3D false; - u8 higher_busy_traffic =3D false; - u8 higher_busy_rx_traffic =3D false; - u8 higher_busy_tx_traffic =3D false; + 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); diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 4088a1aaae3c..e9287e2b2eee 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1652,10 +1652,9 @@ void rtw_dynamic_check_timer_handler(struct adapter = *adapter) if (adapter->net_closed) return; =20 - if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) - && !(hal_btcoex_IsBtControlLps(adapter)) - ) { - u8 should_enter_ps; + if (adapter_to_pwrctl(adapter)->fw_current_in_ps_mode && + !hal_btcoex_IsBtControlLps(adapter)) { + bool should_enter_ps; =20 linked_status_chk(adapter); =20 diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index dd5080056e58..4119d7b6d6db 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 le= n); extern void correct_TSF(struct adapter *padapter, struct mlme_ext_priv *pm= lmeext); 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, u8 from_time= r); =20 int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *= offset); =20 --=20 2.52.0 From nobody Sat Feb 7 11:05:04 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 32C7632D0E3 for ; Sun, 1 Feb 2026 11:40:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769946028; cv=none; b=ucRVkoK6Nkss4HlFh1/8em/Kgm0m4x5I3BoUu68YRnX15RQX6kcLNq0E7aM+V28WvXVDsCSLKgPw+zLzRcUAW7V9lRj4sOFJHU8pI4FNJP/ixur6dbzvjMH21w94w/qR3Ch7fyCmwsLGhvdBZVLCwMUTzIXzHdyDLJpWHgOaqRE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769946028; c=relaxed/simple; bh=P/hMXlaUikZWedH2by3kb/6y3OXEBSzVILcuMMRz9ho=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b34+8wCcfl3WVNQjYbBxdgjD045uUjC4Vs/FNDOKy3FQFUVSUB69OXMqSls6X3aR4M4zGaUvl0ebqJYUkuGI84MojCnxwP1kIBebOq/70i1/yc7h5Fsi24cO/EeIjS08guK82cRU9h73tczBJBE3R7fOuQotte3wEdkg4HXp+bA= 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=cgXwektW; arc=none smtp.client-ip=209.85.214.172 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="cgXwektW" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2a7bced39cfso37008905ad.1 for ; Sun, 01 Feb 2026 03:40:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769946024; x=1770550824; 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=Azjvx2/0kDlRgS0fUfLnzitfRTr8Okc+7JuFReuYNgw=; b=cgXwektWjD2XkvJXDTkZmjUHdylJz46jfnsYWx2K/uWU4oDSO1FO8uIsYgWRKKraJS uHeAWMh6YfUficwLknWNcbTqYhCOpbje1vlDqnSxW0GGnjV75FJaQoX+0M+bD/CEdy9e zjvx6y3rVHQDpZOpmm/s4gmslrqhHzEfdA6B29tJko3FChp9h3Y/t2c8717jNTKSHZV5 IqONblZSx5ANeiC8KmlbKLRFjjvaWkv30poHctBb5ojM9D+Qqcdu67UFnAzSJ6hW7LNq 8UyqxwVenIevI3P+wXTBF0++EKKGtzoVBF5HYt004E73sVV1cZf5CiVtK32A1aYZSl4y l3Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769946024; x=1770550824; 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=Azjvx2/0kDlRgS0fUfLnzitfRTr8Okc+7JuFReuYNgw=; b=OqVAkemjl3DlOWeDa58K6MGR2tldyR0Yi6NmU9Mmdd3Cl9eK1AMDKHRBwZXukDy5fe xTMmg7vwmZevmwuTkQAfLE4vENmeqh21phX/GnpYiLKA6TbFay1GVJN/c6x2jDb2IgV4 Q96kSBh01o9gzVmQyREWV6mkdYSkr1YtJg+cOvkPLCPUZKbdB3lQkW5eMpNtMxMiO8cC McvO/hION6L8TLxx99IzMRPlMO31P2ABKCQE1hr3p9eHTkeZvNf7RmvD/7Mk+KjjSkFq qtdNiQ9yPr3yixfqDvRxNrbKViTfd9pf1x+mfPweEVlFli7hq+6XveXrZzaErk1yNWaH rKsA== X-Forwarded-Encrypted: i=1; AJvYcCVUoUObAXjzol/ZcRcSVOX0mmNdc100Mzoq5R6UpSk65VSirZEGYB5nCK6hw/giDzgEsdtOUaOPV1/sSII=@vger.kernel.org X-Gm-Message-State: AOJu0YxTkmKgOVrECQJInMWR5rWFl3srE/uesOzdXn43LGHmgh56YrUI 8DcnI6RynKJOtruZv9nzedid7SP5e1vc846cwIyAzla25FhLLlHLGwc2 X-Gm-Gg: AZuq6aLuMW2A3OOKPjejw74ap2rn/VaR+H5PpdZ9HW+Y+hy5IjhA26P5zaWXIFJKOdJ JrQYWbzoOAcXwG5rG14PcJ9lLsK4HdIJymbut/7JRyAP34wX7iBkjrTPyf2ZpgS8cbp+lCtIYnK 2dCO2bOdfJWe79revOqx+Bmx9K+UZayJOBWKjFu/JsqvkvXVAQtJIVBjtDkBbpM5gQoTRvWyBEM jaIzMZz26kElXgnOGmDJVW0neqHlhfg72x7vveDmYPH6Mi/EQYXA7MmzBLQG0fZg4wDOLVp83fv dF32MG1qQBAJZF9PDFGOV67Haj4v/Gk1PVBG5HQIM9D1Jjeqcs1N4ARDv+7F/LWbXM5tNLehiXN XTARVepksgxoTp+ODAY2cc0fh1ujQ08Vn0Qge5ORaY6S4UEfl1hB6gf6ro+11A5AUOIQE3sOSh3 fEK6FqfHYFmaoTUvC11xdIkNXtdR4= X-Received: by 2002:a17:902:e887:b0:2a0:b02b:2114 with SMTP id d9443c01a7336-2a8d96a6e14mr86819405ad.11.1769946024303; Sun, 01 Feb 2026 03:40:24 -0800 (PST) Received: from snowman ([2401:4900:614d:8c00:9d3:b11e:236d:377a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b7f7caasm121156675ad.101.2026.02.01.03.40.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Feb 2026 03:40:23 -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 v6 3/4] staging: rtl8723bs: simplify boolean expressions Date: Sun, 1 Feb 2026 17:08:36 +0530 Message-ID: <20260201113837.8531-4-khushalchitturi@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260201113837.8531-1-khushalchitturi@gmail.com> References: <20260201113837.8531-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" Simplify boolean expressions across rtl8723bs to comply with the kernel coding style. Signed-off-by: Khushal Chitturi --- Changelog: v5 -> v6: Extend boolean simplification to ioctl_cfg80211.c and rtw_ioctl_set.c v4 -> v5: Rebased onto current staging-testing. v3 -> v4: Fixed alignment and removed extra parentheses. v2 -> v3: Resubmitted as a versioned series to avoid threading confusion. v1 -> v2: Corrected commit messages. .../staging/rtl8723bs/core/rtw_ioctl_set.c | 63 +++++++++---------- drivers/staging/rtl8723bs/core/rtw_xmit.c | 40 ++++++------ .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 14 ++--- 3 files changed, 58 insertions(+), 59 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/stagi= ng/rtl8723bs/core/rtw_ioctl_set.c index 2d37ac4c50ef..dab20b8a9b18 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c @@ -61,14 +61,11 @@ 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->link_detect_info.busy_traffic =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) pmlmepriv->to_join =3D false; - } else { pmlmepriv->to_join =3D false; ret =3D _FAIL; @@ -84,7 +81,7 @@ u8 rtw_do_join(struct adapter *padapter) pmlmepriv->to_join =3D false; _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); } else { - if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true) { + if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { /* submit createbss_cmd to change to a ADHOC_MASTER */ =20 /* pmlmepriv->lock has been acquired by caller... */ @@ -113,7 +110,7 @@ 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->link_detect_info.busy_traffic =3D=3D false || + 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) @@ -143,32 +140,32 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, stru= ct ndis_802_11_ssid *ssid) netdev_dbg(padapter->pnetdev, "set ssid [%s] fw_state =3D 0x%08x\n", ssid->ssid, get_fwstate(pmlmepriv)); =20 - if (padapter->hw_init_completed =3D=3D false) { + if (!padapter->hw_init_completed) { status =3D _FAIL; goto exit; } =20 spin_lock_bh(&pmlmepriv->lock); =20 - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) =3D=3D true) + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) goto handle_tkip_countermeasure; - else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) =3D=3D true) + else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) goto release_mlme_lock; =20 - if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) =3D=3D t= rue) { + if (check_fwstate(pmlmepriv, _FW_LINKED | WIFI_ADHOC_MASTER_STATE)) { if ((pmlmepriv->assoc_ssid.ssid_length =3D=3D ssid->ssid_length) && (!memcmp(&pmlmepriv->assoc_ssid.ssid, ssid->ssid, ssid->ssid_length)= )) { - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) =3D=3D false) { - if (rtw_is_same_ibss(padapter, pnetwork) =3D=3D false) { + if (!check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { + if (!rtw_is_same_ibss(padapter, pnetwork)) { /* if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or re= join again */ rtw_disassoc_cmd(padapter, 0, true); =20 - if (check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) + if (check_fwstate(pmlmepriv, _FW_LINKED)) rtw_indicate_disconnect(padapter); =20 rtw_free_assoc_resources(padapter, 1); =20 - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true) { + if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) { _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE); set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); } @@ -181,12 +178,12 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, stru= ct ndis_802_11_ssid *ssid) } else { rtw_disassoc_cmd(padapter, 0, true); =20 - if (check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) + if (check_fwstate(pmlmepriv, _FW_LINKED)) rtw_indicate_disconnect(padapter); =20 rtw_free_assoc_resources(padapter, 1); =20 - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true) { + if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) { _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE); set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); } @@ -199,7 +196,7 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct= ndis_802_11_ssid *ssid) goto release_mlme_lock; } =20 - if (rtw_validate_ssid(ssid) =3D=3D false) { + if (!rtw_validate_ssid(ssid)) { status =3D _FAIL; goto release_mlme_lock; } @@ -207,7 +204,7 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct= ndis_802_11_ssid *ssid) memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(struct ndis_802_11_ssid)); pmlmepriv->assoc_by_bssid =3D false; =20 - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) =3D=3D true) + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) pmlmepriv->to_join =3D true; else status =3D rtw_do_join(padapter); @@ -227,10 +224,10 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u= 8 *bssid, struct ndis_802_1 bool ssid_valid =3D true; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 - if (!ssid || rtw_validate_ssid(ssid) =3D=3D false) + if (!ssid || !rtw_validate_ssid(ssid)) ssid_valid =3D false; =20 - if (!bssid || rtw_validate_bssid(bssid) =3D=3D false) + if (!bssid || !rtw_validate_bssid(bssid)) bssid_valid =3D false; =20 if (!ssid_valid && !bssid_valid) { @@ -238,7 +235,7 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u8 = *bssid, struct ndis_802_1 goto exit; } =20 - if (padapter->hw_init_completed =3D=3D false) { + if (!padapter->hw_init_completed) { status =3D _FAIL; goto exit; } @@ -248,9 +245,9 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u8 = *bssid, struct ndis_802_1 netdev_dbg(padapter->pnetdev, FUNC_ADPT_FMT " fw_state =3D 0x%08x\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv)); =20 - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) =3D=3D true) + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) goto handle_tkip_countermeasure; - else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) =3D=3D true) + else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) goto release_mlme_lock; =20 handle_tkip_countermeasure: @@ -271,7 +268,7 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u8 = *bssid, struct ndis_802_1 pmlmepriv->assoc_by_bssid =3D false; } =20 - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) =3D=3D true) + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) pmlmepriv->to_join =3D true; else status =3D rtw_do_join(padapter); @@ -300,15 +297,15 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter = *padapter, =20 spin_lock_bh(&pmlmepriv->lock); =20 - if ((check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) || (*pold_state = =3D=3D Ndis802_11IBSS)) + if (check_fwstate(pmlmepriv, _FW_LINKED) || *pold_state =3D=3D Ndis802_1= 1IBSS) rtw_disassoc_cmd(padapter, 0, true); =20 - if ((check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true)) + if (check_fwstate(pmlmepriv, _FW_LINKED) || + check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) rtw_free_assoc_resources(padapter, 1); =20 - if ((*pold_state =3D=3D Ndis802_11Infrastructure) || (*pold_state =3D=3D= Ndis802_11IBSS)) { - if (check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) + if (*pold_state =3D=3D Ndis802_11Infrastructure || *pold_state =3D=3D Nd= is802_11IBSS) { + if (check_fwstate(pmlmepriv, _FW_LINKED)) rtw_indicate_disconnect(padapter); /* will clr Linked_state; before th= is function, we must have checked whether issue dis-assoc_cmd or not */ } =20 @@ -351,7 +348,7 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter) =20 spin_lock_bh(&pmlmepriv->lock); =20 - if (check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) { + if (check_fwstate(pmlmepriv, _FW_LINKED)) { rtw_disassoc_cmd(padapter, 0, true); rtw_indicate_disconnect(padapter); /* modify for CONFIG_IEEE80211W, none 11w can use it */ @@ -373,13 +370,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->link_detect_info.busy_traffic =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_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index bff8f8e76a63..06537f21bbe6 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -384,8 +384,9 @@ static void update_attrib_vcs_info(struct adapter *pada= pter, struct xmit_frame * } else { while (true) { /* IOT action */ - if ((pmlmeinfo->assoc_AP_vendor =3D=3D HT_IOT_PEER_ATHEROS) && (pattrib= ->ampdu_en =3D=3D true) && - (padapter->securitypriv.dot11PrivacyAlgrthm =3D=3D _AES_)) { + if (pmlmeinfo->assoc_AP_vendor =3D=3D HT_IOT_PEER_ATHEROS && + pattrib->ampdu_en && + padapter->securitypriv.dot11PrivacyAlgrthm =3D=3D _AES_) { pattrib->vcs_mode =3D CTS_TO_SELF; break; } @@ -420,7 +421,7 @@ static void update_attrib_vcs_info(struct adapter *pada= pter, struct xmit_frame * /* to do list: check MIMO power save condition. */ =20 /* check AMPDU aggregation for TXOP */ - if (pattrib->ampdu_en =3D=3D true) { + if (pattrib->ampdu_en) { pattrib->vcs_mode =3D RTS_CTS; break; } @@ -482,10 +483,10 @@ static s32 update_attrib_sec_info(struct adapter *pad= apter, struct pkt_attrib *p memset(pattrib->dot11tkiptxmickey.skey, 0, 16); pattrib->mac_id =3D psta->mac_id; =20 - if (psta->ieee8021x_blocked =3D=3D true) { + if (psta->ieee8021x_blocked) { pattrib->encrypt =3D 0; =20 - if ((pattrib->ether_type !=3D 0x888e) && (check_fwstate(pmlmepriv, WIFI_= MP_STATE) =3D=3D false)) { + if (pattrib->ether_type !=3D 0x888e && !check_fwstate(pmlmepriv, WIFI_MP= _STATE)) { res =3D _FAIL; goto exit; } @@ -639,8 +640,8 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p memcpy(pattrib->dst, ðerhdr.h_dest, ETH_ALEN); memcpy(pattrib->src, ðerhdr.h_source, ETH_ALEN); =20 - if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true)) { + if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) || + check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) { memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); memcpy(pattrib->ta, pattrib->src, ETH_ALEN); } else if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { @@ -704,7 +705,8 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p if (!psta) { /* if we cannot get psta =3D> drop the pkt */ res =3D _FAIL; goto exit; - } else if ((check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D true) && (!(p= sta->state & _FW_LINKED))) { + } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) && + !(psta->state & _FW_LINKED)) { res =3D _FAIL; goto exit; } @@ -881,7 +883,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr,= struct pkt_attrib *pattr SetFrameSubType(fctrl, pattrib->subtype); =20 if (pattrib->subtype & WIFI_DATA_TYPE) { - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) =3D=3D true) { + if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { /* to_ds =3D 1, fr_ds =3D 0; */ =20 { @@ -895,7 +897,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr,= struct pkt_attrib *pattr =20 if (pqospriv->qos_option) qos_option =3D true; - } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D true) { + } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) { /* to_ds =3D 0, fr_ds =3D 1; */ SetFrDs(fctrl); memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); @@ -904,8 +906,8 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr,= struct pkt_attrib *pattr =20 if (pattrib->qos_en) qos_option =3D true; - } else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true)) { + } else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) || + check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) { memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN); @@ -963,7 +965,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr,= struct pkt_attrib *pattr pattrib->ampdu_en =3D true; =20 /* re-check if enable ampdu by BA_starting_seqctrl */ - if (pattrib->ampdu_en =3D=3D true) { + if (pattrib->ampdu_en) { u16 tx_seq; =20 tx_seq =3D psta->BA_starting_seqctrl[pattrib->priority & 0x0f]; @@ -1114,7 +1116,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, = struct sk_buff *pkt, struct =20 frg_inx++; =20 - if (bmcst || (rtw_endofpktfile(&pktfile) =3D=3D true)) { + if (bmcst || rtw_endofpktfile(&pktfile)) { pattrib->nr_frags =3D frg_inx; =20 pattrib->last_txcmdsz =3D pattrib->hdrlen + pattrib->iv_len + @@ -1140,7 +1142,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, = struct sk_buff *pkt, struct =20 xmitframe_swencrypt(padapter, pxmitframe); =20 - if (bmcst =3D=3D false) + if (!bmcst) update_attrib_vcs_info(padapter, pxmitframe); else pattrib->vcs_mode =3D NONE_VCS; @@ -1977,14 +1979,14 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_bu= ff **ppkt) do_queue_select(padapter, &pxmitframe->attrib); =20 spin_lock_bh(&pxmitpriv->lock); - if (xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe) =3D=3D true)= { + if (xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe)) { spin_unlock_bh(&pxmitpriv->lock); return 1; } spin_unlock_bh(&pxmitpriv->lock); =20 /* pre_xmitframe */ - if (rtw_hal_xmit(padapter, pxmitframe) =3D=3D false) + if (!rtw_hal_xmit(padapter, pxmitframe)) return 1; =20 return 0; @@ -2028,7 +2030,7 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct = adapter *padapter, struct x signed int bmcst =3D is_multicast_ether_addr(pattrib->ra); bool update_tim =3D false; =20 - if (check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D false) + if (!check_fwstate(pmlmepriv, WIFI_AP_STATE)) return ret; psta =3D rtw_get_stainfo(&padapter->stapriv, pattrib->ra); if (pattrib->psta !=3D psta) @@ -2153,7 +2155,7 @@ static void dequeue_xmitframes_to_sleeping_queue(stru= ct adapter *padapter, struc =20 ret =3D xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe); =20 - if (true =3D=3D ret) { + if (ret) { ptxservq =3D rtw_get_sta_pending(padapter, psta, pattrib->priority, (u8= *)(&ac_index)); =20 ptxservq->qcnt--; diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index 62b249cc23ef..a6f12541b1a7 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -1072,7 +1072,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wi= phy, =20 rtw_wdev->iftype =3D type; =20 - if (rtw_set_802_11_infrastructure_mode(padapter, networkType) =3D=3D fals= e) { + if (!rtw_set_802_11_infrastructure_mode(padapter, networkType)) { rtw_wdev->iftype =3D old_type; ret =3D -EPERM; goto exit; @@ -1283,7 +1283,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy } spin_unlock_bh(&pmlmepriv->lock); =20 - if (_status =3D=3D false) + if (!_status) ret =3D -1; =20 check_need_indicate_scan_done: @@ -1585,7 +1585,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy= , struct net_device *ndev, ret =3D rtw_cfg80211_set_auth_type(psecuritypriv, NL80211_AUTHTYPE_OPEN_S= YSTEM); rtw_set_802_11_authentication_mode(padapter, psecuritypriv->ndisauthtype); =20 - if (rtw_set_802_11_ssid(padapter, &ndis_ssid) =3D=3D false) { + if (!rtw_set_802_11_ssid(padapter, &ndis_ssid)) { ret =3D -1; goto exit; } @@ -1611,7 +1611,7 @@ static int cfg80211_rtw_leave_ibss(struct wiphy *wiph= y, struct net_device *ndev) =20 rtw_wdev->iftype =3D NL80211_IFTYPE_STATION; =20 - if (rtw_set_802_11_infrastructure_mode(padapter, Ndis802_11Infrastructur= e) =3D=3D false) { + if (!rtw_set_802_11_infrastructure_mode(padapter, Ndis802_11Infrastructu= re)) { rtw_wdev->iftype =3D old_type; ret =3D -EPERM; goto leave_ibss; @@ -1764,7 +1764,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, = struct net_device *ndev, =20 /* rtw_set_802_11_encryption_mode(padapter, padapter->securitypriv.ndisen= cryptstatus); */ =20 - if (rtw_set_802_11_connect(padapter, (u8 *)sme->bssid, &ndis_ssid) =3D=3D= false) { + if (!rtw_set_802_11_connect(padapter, (u8 *)sme->bssid, &ndis_ssid)) { ret =3D -1; goto exit; } @@ -2070,7 +2070,7 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry= (struct sk_buff *skb, struc u32 len =3D skb->len; u8 category, action; =20 - if (rtw_action_frame_parse(buf, len, &category, &action) =3D=3D false) + if (!rtw_action_frame_parse(buf, len, &category, &action)) goto fail; =20 /* starting alloc mgmt frame to dump it */ @@ -2551,7 +2551,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, = struct wireless_dev *wdev, /* indicate ack before issue frame to avoid racing with rsp frame */ rtw_cfg80211_mgmt_tx_status(padapter, *cookie, buf, len, ack, GFP_KERNEL); =20 - if (rtw_action_frame_parse(buf, len, &category, &action) =3D=3D false) + if (!rtw_action_frame_parse(buf, len, &category, &action)) goto exit; =20 rtw_ps_deny(padapter, PS_DENY_MGNT_TX); --=20 2.52.0 From nobody Sat Feb 7 11:05:04 2026 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 0164932BF26 for ; Sun, 1 Feb 2026 11:40:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769946039; cv=none; b=UJZGRI+bFx5Pi3Icrg1/oUjID5XdCpRaUhrtb0DvBFMCT/w/EhzxgctRL0xGgCdKCJcHxc4P0gMvZSMH0U25YLlKbD4rjigzM+ixl4nuIeYue3Ek6IDI/wNrmdUk+d/m1JwQQ8Q1iDQ204sgzqpdwIWRuPQHfBPZK+vHv6BlVX0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769946039; c=relaxed/simple; bh=vbEGr0UUqH4pisbLNDIa3XJWZ6anEgiy4TqqCBcTZr0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AHvfc/52LjXa5pGZiK7JzX0RCWQ5X59VvKnei65iuzmdzm2QMBfxcW4Fx4kIb+Uvp1o4P5fsmAUIDSRakq2L4Pgm1JImEAUz6bvO1rTew74mYD3PLldY1vCCxhOfcEDZ5m6GeJBwztAG4kTblJWlCLmevJfrCYLGsC57n2zkzPw= 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=Jduqxm6H; arc=none smtp.client-ip=209.85.210.178 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="Jduqxm6H" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-81ed3e6b8e3so1837847b3a.2 for ; Sun, 01 Feb 2026 03:40:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769946037; x=1770550837; 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=5+FurWu8aQVGjuPbej29DU2QlB1gNwYsDPJkjOJmyAw=; b=Jduqxm6H6A48dNISmxHwkoE6AEAOWkx6CmkykW3lotxqZprqWKSfyPKA/A84pzef1M q1rgpxzXBqtUwSZsVwTyssalonkjlJm2ynEsaU4FGgwiUvwIW8MEHFS9flbjyZ8Ku/+Y iWeoBykmHeWXNS9I/YNgUIcqbYKdEyTBLvHH71YTFdPv/Dlc3mrrwRhcrKUtDBey8gK8 Mzz0McMBBtQ/xhaoemoApffFvyOCWhUw00zsXwOaM5YWEIZp5bvW4lwp3SQfntDB+/bM bbHLJUXz5TRnt1xnV1iEtmwjah8me4LYiN0+pKfxI9YvNlaLDjdkLBNleinW1v7lxXUP Vi3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769946037; x=1770550837; 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=5+FurWu8aQVGjuPbej29DU2QlB1gNwYsDPJkjOJmyAw=; b=J9+Cn2WctOzW+mZKd3VcvNKdSTwzOIp/wPFI/mlEJu1RmbDDqndmsTt45Yc34lWobD LMqCCyVzANrpMsU7t3mVvV93hnofjRQKhQ/AE21lP3024AcXUUhii5qzNqG6w83mru6e 4WL5yEWdyscX8maQQb8ZFlN07wkkhexIs/wxmMNBbbY49PvpBvoacL+7sfNmTy9xfwgU XyxGtLsLq86rWKRA+/skSaOa2Vmea97vjJD+pxn1M+sPM8xCafyGp/ZatVsyPF6P9s2F EUXZf+/WAdhBE8+5BuBwqG9s+FChRnFkeZXVHzwbMcQ9i9LBk4OfBeTUi2T2lsfU9s+t RUtQ== X-Forwarded-Encrypted: i=1; AJvYcCWTS/TI+lvDnZAgQyqNmhkLsIpIy7eyjxxVoKnqLOE/EdmN5o9N+0yx7HL1fSOS6dHNg+XLzUwtV8xsab0=@vger.kernel.org X-Gm-Message-State: AOJu0Yz7fYwmlmhEX8lr7OSYnsO4h+Cg8AntNsTtsI3KOhdC0sRUk+cj u3DQA3UcAohlszlHDN1uAtm9dIqmeuG4tqHhTa9NaagQUDwO4T4cgaBO X-Gm-Gg: AZuq6aLIEFJz3Wx7MP6Tmu0cEM/zLf7F8+nqOTvhQQcmG82xHOXa4DiT0wiY7Ja5YHQ WhfymmHo3g6/5G2gAc34rzLS77/9F4rBuaFnEj29w0Fvzp5IscUAK/sogXAj/ksxTS4tmlai1cO 0/VPcYAPQzFcOcOViK74ihCLIvHK/Sg8X1IhGkOxtA/zJf9myLStkT+kM4128YTyjM3oC3XL3rW sniF3g6nwLre6GkjHfkUw7pJkyQdQ3B8ldskhmFJRy0komd9cSwTsU33rZYKfDaN6o5BH+/nFvJ PW6UwYkX8pI57iBiXjVr2JHzRmyrkZ0TyCE83BBu1eeQTbPODi5tKBUH4H+V+TXf1EZz99aUv7X VVGT/noMjjbuBz9KPEaLZNG6Cb277uJNIx6R7MfSEuuMOEoUlGe19/KV95ptZ2W4cl55TwUfHyK UmNLRpIu93SSdaAGpR X-Received: by 2002:a05:6a21:3985:b0:37e:4319:d7c8 with SMTP id adf61e73a8af0-392e01b5b42mr7638404637.75.1769946037210; Sun, 01 Feb 2026 03:40:37 -0800 (PST) Received: from snowman ([2401:4900:614d:8c00:9d3:b11e:236d:377a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b7f7caasm121156675ad.101.2026.02.01.03.40.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Feb 2026 03:40:36 -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 v6 4/4] staging: rtl8723bs: fix line length and alignment issues Date: Sun, 1 Feb 2026 17:08:37 +0530 Message-ID: <20260201113837.8531-5-khushalchitturi@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260201113837.8531-1-khushalchitturi@gmail.com> References: <20260201113837.8531-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" Fix multiple coding style issues in rtw_xmit.c to comply with the kernel coding style by splitting expressions and adjusting alignment. This patch resolves checkpatch.pl warnings caused by line length exceeding 100 columns and alignment matching the open parenthesis. Signed-off-by: Khushal Chitturi --- Changelog: v5 -> v6: No changes. v4 -> v5: Rebased onto current staging-testing. v3 -> v4: Adjusted comment formatting. v2 -> v3: Resubmitted as a versioned series to resolve threading confusion. v1 -> v2: No changes. drivers/staging/rtl8723bs/core/rtw_xmit.c | 107 +++++++++++++--------- 1 file changed, 66 insertions(+), 41 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index 06537f21bbe6..be1054234bb2 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -126,10 +126,14 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, = struct adapter *padapter) pxmitbuf->buf_tag =3D XMITBUF_DATA; =20 /* Tx buf allocation may fail sometimes, so sleep and retry. */ - res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ += XMITBUF_ALIGN_SZ), true); + res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, + (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ), + true); if (res =3D=3D _FAIL) { msleep(10); - res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ = + XMITBUF_ALIGN_SZ), true); + res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, + (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ), + true); if (res =3D=3D _FAIL) goto exit; } @@ -208,7 +212,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) pxmitbuf->padapter =3D padapter; pxmitbuf->buf_tag =3D XMITBUF_MGNT; =20 - res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, MAX_XMIT_EXTBUF_S= Z + XMITBUF_ALIGN_SZ, true); + res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, + MAX_XMIT_EXTBUF_SZ + XMITBUF_ALIGN_SZ, + true); if (res =3D=3D _FAIL) { res =3D _FAIL; goto exit; @@ -291,7 +297,9 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) } =20 for (i =3D 0; i < NR_XMITBUFF; i++) { - rtw_os_xmit_resource_free(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_= ALIGN_SZ), true); + rtw_os_xmit_resource_free(padapter, pxmitbuf, + (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ), + true); =20 pxmitbuf++; } @@ -313,7 +321,9 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) /* free xmit extension buff */ pxmitbuf =3D (struct xmit_buf *)pxmitpriv->pxmit_extbuf; for (i =3D 0; i < NR_XMIT_EXTBUFF; i++) { - rtw_os_xmit_resource_free(padapter, pxmitbuf, (MAX_XMIT_EXTBUF_SZ + XMIT= BUF_ALIGN_SZ), true); + rtw_os_xmit_resource_free(padapter, pxmitbuf, + (MAX_XMIT_EXTBUF_SZ + XMITBUF_ALIGN_SZ), + true); =20 pxmitbuf++; } @@ -366,10 +376,12 @@ static void update_attrib_vcs_info(struct adapter *pa= dapter, struct xmit_frame * else /* no frag */ sz =3D pattrib->last_txcmdsz; =20 - /* (1) RTS_Threshold is compared to the MPDU, not MSDU. */ - /* (2) If there are more than one frag in this MSDU, only the first fra= g uses protection frame. */ - /* Other fragments are protected by previous fragment. */ - /* So we only need to check the length of first fragment. */ + /* (1) RTS_Threshold is compared to the MPDU, not MSDU. + * (2) If there are more than one frag in this MSDU, only the + * first frag uses protection frame. Other fragments are + * protected by the previous fragment, so we only need to + * check the length of first fragment. + */ if (pmlmeext->cur_wireless_mode < WIRELESS_11_24N || padapter->registryp= riv.wifi_spec) { if (sz > padapter->registrypriv.rts_thresh) { pattrib->vcs_mode =3D RTS_CTS; @@ -436,7 +448,8 @@ static void update_attrib_vcs_info(struct adapter *pada= pter, struct xmit_frame * pattrib->vcs_mode =3D padapter->driver_vcs_type; } =20 -static void update_attrib_phy_info(struct adapter *padapter, struct pkt_at= trib *pattrib, struct sta_info *psta) +static void update_attrib_phy_info(struct adapter *padapter, struct pkt_at= trib *pattrib, + struct sta_info *psta) { struct mlme_ext_priv *mlmeext =3D &padapter->mlmeextpriv; =20 @@ -464,7 +477,8 @@ static void update_attrib_phy_info(struct adapter *pada= pter, struct pkt_attrib * pattrib->ch_offset =3D psta->htpriv.ch_offset; pattrib->ampdu_en =3D false; =20 - if (padapter->driver_ampdu_spacing !=3D 0xFF) /* driver control AMPDU Den= sity for peer sta's rx */ + /* driver control AMPDU Density for peer sta's rx */ + if (padapter->driver_ampdu_spacing !=3D 0xFF) pattrib->ampdu_spacing =3D padapter->driver_ampdu_spacing; else pattrib->ampdu_spacing =3D psta->htpriv.rx_ampdu_min_spacing; @@ -472,7 +486,8 @@ static void update_attrib_phy_info(struct adapter *pada= pter, struct pkt_attrib * pattrib->retry_ctrl =3D false; } =20 -static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_att= rib *pattrib, struct sta_info *psta) +static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_att= rib *pattrib, + struct sta_info *psta) { signed int res =3D _SUCCESS; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; @@ -511,7 +526,8 @@ static s32 update_attrib_sec_info(struct adapter *padap= ter, struct pkt_attrib *p } =20 /* For WPS 1.0 WEP, driver should not encrypt EAPOL Packet for WPS hands= hake. */ - if (((pattrib->encrypt =3D=3D _WEP40_) || (pattrib->encrypt =3D=3D _WEP1= 04_)) && (pattrib->ether_type =3D=3D 0x888e)) + if ((pattrib->encrypt =3D=3D _WEP40_ || pattrib->encrypt =3D=3D _WEP104_= ) && + pattrib->ether_type =3D=3D 0x888e) pattrib->encrypt =3D _NO_PRIVACY_; } =20 @@ -563,7 +579,7 @@ static s32 update_attrib_sec_info(struct adapter *padap= ter, struct pkt_attrib *p memcpy(pattrib->dot118021x_UncstKey.skey, psta->dot118021x_UncstKey.skey= , 16); =20 if (pattrib->encrypt && - ((padapter->securitypriv.sw_encrypt) || (!psecuritypriv->hw_decrypted))) + (padapter->securitypriv.sw_encrypt || !psecuritypriv->hw_decrypted)) pattrib->bswenc =3D true; else pattrib->bswenc =3D false; @@ -655,8 +671,9 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p pattrib->pktlen =3D pktfile.pkt_len; =20 if (pattrib->ether_type =3D=3D ETH_P_IP) { - /* The following is for DHCP and ARP packet, we use cck1M to tx these p= ackets and let LPS awake some time */ - /* to prevent DHCP protocol fail */ + /* The following is for DHCP and ARP packets, we use cck1M to tx these + * packets and let LPS awake some time to prevent DHCP protocol fail + */ =20 u8 tmp[24]; =20 @@ -665,8 +682,8 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p pattrib->dhcp_pkt =3D 0; if (pktfile.pkt_len > 282) {/* MINIMUM_DHCP_PACKET_SIZE) { */ if (pattrib->ether_type =3D=3D ETH_P_IP) {/* IP header */ - if (((tmp[21] =3D=3D 68) && (tmp[23] =3D=3D 67)) || - ((tmp[21] =3D=3D 67) && (tmp[23] =3D=3D 68))) { + if ((tmp[21] =3D=3D 68 && tmp[23] =3D=3D 67) || + (tmp[21] =3D=3D 67 && tmp[23] =3D=3D 68)) { /* 68 : UDP BOOTP client */ /* 67 : UDP BOOTP server */ pattrib->dhcp_pkt =3D 1; @@ -778,7 +795,8 @@ static s32 xmitframe_addmic(struct adapter *padapter, s= truct xmit_frame *pxmitfr if (pattrib->encrypt =3D=3D _TKIP_) { /* encode mic code */ { - u8 null_key[16] =3D {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, = 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; + u8 null_key[16] =3D {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; =20 pframe =3D pxmitframe->buf_addr + hw_hdr_offset; =20 @@ -998,10 +1016,10 @@ s32 rtw_txframes_pending(struct adapter *padapter) { struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; =20 - return ((!list_empty(&pxmitpriv->be_pending.queue)) || - (!list_empty(&pxmitpriv->bk_pending.queue)) || - (!list_empty(&pxmitpriv->vi_pending.queue)) || - (!list_empty(&pxmitpriv->vo_pending.queue))); + return !list_empty(&pxmitpriv->be_pending.queue) || + !list_empty(&pxmitpriv->bk_pending.queue) || + !list_empty(&pxmitpriv->vi_pending.queue) || + !list_empty(&pxmitpriv->vo_pending.queue); } =20 /* @@ -1031,7 +1049,8 @@ u32 rtw_calculate_wlan_pkt_size_by_attribue(struct pk= t_attrib *pattrib) * 5. move frag chunk from pframe to pxmitframe->mem * 6. apply sw-encrypt, if necessary. */ -s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, = struct xmit_frame *pxmitframe) +s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, + struct xmit_frame *pxmitframe) { struct pkt_file pktfile; =20 @@ -1152,7 +1171,8 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, = struct sk_buff *pkt, struct } =20 /* broadcast or multicast management pkt use BIP, unicast management pkt u= se CCMP encryption */ -s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *= pkt, struct xmit_frame *pxmitframe) +s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *= pkt, + struct xmit_frame *pxmitframe) { u8 *pframe, *mem_start =3D NULL, *tmp_buf =3D NULL; u8 subtype; @@ -1235,7 +1255,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padap= ter, struct sk_buff *pkt, s } else { /* unicast mgmt frame TX */ /* start to encrypt mgmt frame */ if (subtype =3D=3D WIFI_DEAUTH || subtype =3D=3D WIFI_DISASSOC || - subtype =3D=3D WIFI_REASSOCREQ || subtype =3D=3D WIFI_ACTION) { + subtype =3D=3D WIFI_REASSOCREQ || subtype =3D=3D WIFI_ACTION) { if (pattrib->psta) psta =3D pattrib->psta; else @@ -1249,11 +1269,11 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *pad= apter, struct sk_buff *pkt, s =20 /* according 802.11-2012 standard, these five types are not robust type= s */ if (subtype =3D=3D WIFI_ACTION && - (pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_PUBLIC || - pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_HT || - pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_UNPROTECTED_WNM || - pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_SELF_PROTECTED || - pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_P2P)) + (pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_PUBLIC || + pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_HT || + pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_UNPROTECTED_WNM || + pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_SELF_PROTECTED || + pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_P2P)) goto xmitframe_coalesce_fail; /* before encrypt dump the management packet content */ if (pattrib->encrypt > 0) @@ -1410,7 +1430,7 @@ void rtw_count_tx_stats(struct adapter *padapter, str= uct xmit_frame *pxmitframe, } =20 static struct xmit_buf *__rtw_alloc_cmd_xmitbuf(struct xmit_priv *pxmitpri= v, - enum cmdbuf_type buf_type) + enum cmdbuf_type buf_type) { struct xmit_buf *pxmitbuf =3D NULL; =20 @@ -1431,7 +1451,7 @@ static struct xmit_buf *__rtw_alloc_cmd_xmitbuf(struc= t xmit_priv *pxmitpriv, } =20 struct xmit_frame *__rtw_alloc_cmdxmitframe(struct xmit_priv *pxmitpriv, - enum cmdbuf_type buf_type) + enum cmdbuf_type buf_type) { struct xmit_frame *pcmdframe; struct xmit_buf *pxmitbuf; @@ -1766,7 +1786,8 @@ s32 rtw_xmitframe_enqueue(struct adapter *padapter, s= truct xmit_frame *pxmitfram return _SUCCESS; } =20 -struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_= info *psta, signed int up, u8 *ac) +struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_= info *psta, + signed int up, u8 *ac) { struct tx_servq *ptxservq =3D NULL; =20 @@ -2020,7 +2041,8 @@ inline bool xmitframe_hiq_filter(struct xmit_frame *x= mitframe) return allow; } =20 -signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, st= ruct xmit_frame *pxmitframe) +signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, + struct xmit_frame *pxmitframe) { signed int ret =3D false; struct sta_info *psta =3D NULL; @@ -2115,7 +2137,8 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct = adapter *padapter, struct x if (wmmps_ac) psta->sleepq_ac_len++; =20 - if (((psta->has_legacy_ac) && (!wmmps_ac)) || ((!psta->has_legacy_ac) &= & (wmmps_ac))) { + if ((psta->has_legacy_ac && !wmmps_ac) || + (!psta->has_legacy_ac && wmmps_ac)) { if (!(pstapriv->tim_bitmap & BIT(psta->aid))) update_tim =3D true; =20 @@ -2135,7 +2158,8 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct = adapter *padapter, struct x return ret; } =20 -static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter,= struct sta_info *psta, struct __queue *pframequeue) +static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter,= struct sta_info *psta, + struct __queue *pframequeue) { signed int ret; struct list_head *plist, *phead, *tmp; @@ -2156,7 +2180,8 @@ static void dequeue_xmitframes_to_sleeping_queue(stru= ct adapter *padapter, struc ret =3D xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe); =20 if (ret) { - ptxservq =3D rtw_get_sta_pending(padapter, psta, pattrib->priority, (u8= *)(&ac_index)); + ptxservq =3D rtw_get_sta_pending(padapter, psta, pattrib->priority, + (u8 *)(&ac_index)); =20 ptxservq->qcnt--; phwxmits[ac_index].accnt--; @@ -2461,9 +2486,9 @@ struct xmit_buf *dequeue_pending_xmitbuf_under_survey= (struct xmit_priv *pxmitpri =20 type =3D GetFrameSubType(pxmitbuf->pbuf + TXDESC_OFFSET); =20 - if ((type =3D=3D WIFI_PROBEREQ) || - (type =3D=3D WIFI_DATA_NULL) || - (type =3D=3D WIFI_QOS_DATA_NULL)) { + if (type =3D=3D WIFI_PROBEREQ || + type =3D=3D WIFI_DATA_NULL || + type =3D=3D WIFI_QOS_DATA_NULL) { list_del_init(&pxmitbuf->list); break; } --=20 2.52.0