From nobody Sat Jun 13 07:45:37 2026 Received: from mail.cipherat.com (mail.cipherat.com [91.98.42.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09C58393DF9 for ; Fri, 8 May 2026 22:27:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.98.42.103 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279254; cv=none; b=mRCaO42a/Ssm5d4j10ev3BYy5GPzHgE3UK/lD08SBVpX3f2isoP3Y1yzBiFyxwXIAjD8PfA+dtR2ot1hhq+RyvK2S+TMHbn5PaGd6AimHAnJR8Ws7uPx9t++aNRUF/P/Pk0Oo7DScpyk2RlVQG1VHck/tRTg4FtC85UkMyG0Vq4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279254; c=relaxed/simple; bh=ogfnSpVkWhJjYE4H76H+8fnS1yys5WSfk3yGwfOQqio=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V2+69ZBjtHzOUlZNAzNAoLrWqjYyEd68lW6dzNoSLyYwj/8H2i2DWvSW6KEqbxdhXvibidltUvBhpWVOTunrFpeckUqpevITndLMMJZ1YMwJItHxiXj/dU3GI8bVOeO40OL1G4jhPs7fqLv6kl35t98UuiCyESfzkVvRSuWv9xU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com; spf=pass smtp.mailfrom=cipherat.com; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b=cATJV1YC; arc=none smtp.client-ip=91.98.42.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cipherat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b="cATJV1YC" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id F3BF284FCC; Sat, 9 May 2026 01:27:30 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1778279251; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=Ds0s6x/IEdSEFe5Ej/ZAy7XvpQEIA8Z6370zk4udx44=; b=cATJV1YCT9jD/Ln9Zdmee3ipKMoY0jsfuzoNhqjwv773Y6HKytKz60dScFpIn2MeEBP3RO 8i+zduJIXlQDuix5RWGcGrDV4ZFWOIzksRSR8tnBl17aaqQkdeWVAApXAhU33FXifTCPFk 4FeiuG9kYjekQ+rco+GddbW3LfTWbK+xyIsN/dh0yHdOPqSO7KpQsWlpDNlPdWmaQUBHxz usIv2NvnfGn164euzSnPy1L0fCs6h/BEwWET+PDBNtkCzaThI8wQY3gRpgPIGax7TeV+wy Md3qGJCL+ZTFg3i4LyypPsmFcfDRqlAN4xuHKru5at+ycVWEyIryO2i0vyzw8bXUBCdOlv MEB5m0SeqBQInPTPviz9flgDTJ9RY6WJD55tDlt2RWrjkY6JUT9O1plUnOTNriE+vouERm xhDAqjrlT4Po8Omi3zrA2Sg1woXxsRXDPb00H3PGFXGINvCKUVdJQQs2KGLDmI0DrYeTFD YnIrytKk2KPGAkzvz4CW6AeDh5ESCjlNEy97jRjoaX5xuvDExWi1HsDMJjy8/pyavQfXic OpCfed9jzW30R4abuZQSfHehvX4jZRTKn7k7+XnDfhe5i1weCYUClyI/LBz7ny6Si65Wn1 E0mAn8mB0wb/OmuHMcIPx/YcpEeiQwVY8g0+9MkIxQumfAIV2tMD0= From: Salman Alghamdi To: gregkh@linuxfoundation.org Cc: straube.linux@gmail.com, error27@gmail.com, luka.gejak@linux.dev, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v7 1/7] staging: rtl8723bs: rtw_mlme: add bounds checks before ie_length subtraction Date: Sat, 9 May 2026 01:26:57 +0300 Message-ID: <20260508222725.24075-2-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260508222725.24075-1-me@cipherat.com> References: <20260508222725.24075-1-me@cipherat.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 X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" Add guards to ensure ie_length is large enough before subtracting fixed IE offsets to prevent unsigned integer underflow. Signed-off-by: Salman Alghamdi --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 268f294528e6..9f21a2226dbd 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -604,6 +604,8 @@ static bool rtw_is_desired_network(struct adapter *adap= ter, struct wlan_network privacy =3D pnetwork->network.privacy; =20 if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) { + if (pnetwork->network.ie_length < _FIXED_IE_LENGTH_) + return false; if (rtw_get_wps_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, pnetwork->= network.ie_length - _FIXED_IE_LENGTH_, NULL, &wps_ielen)) return true; else @@ -617,11 +619,15 @@ static bool rtw_is_desired_network(struct adapter *ad= apter, struct wlan_network bselected =3D false; =20 if (psecuritypriv->ndisauthtype =3D=3D Ndis802_11AuthModeWPA2PSK) { - p =3D rtw_get_ie(pnetwork->network.ies + _BEACON_IE_OFFSET_, WLAN_EID_R= SN, &ie_len, (pnetwork->network.ie_length - _BEACON_IE_OFFSET_)); - if (p && ie_len > 0) - bselected =3D true; - else + if (pnetwork->network.ie_length < _BEACON_IE_OFFSET_) { bselected =3D false; + } else { + p =3D rtw_get_ie(pnetwork->network.ies + _BEACON_IE_OFFSET_, WLAN_EID_= RSN, &ie_len, (pnetwork->network.ie_length - _BEACON_IE_OFFSET_)); + if (p && ie_len > 0) + bselected =3D true; + else + bselected =3D false; + } } } =20 --=20 2.54.0 From nobody Sat Jun 13 07:45:37 2026 Received: from mail.cipherat.com (mail.cipherat.com [91.98.42.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3BE7390221 for ; Fri, 8 May 2026 22:27:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.98.42.103 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279258; cv=none; b=uC3FU3lpkPbKTccZamQcaPMs4clTejckFHisvbANOIJJZST5Z8a8JZVHugVgjlZ0R19DwybfgRvyY+svUrpijaC9SJIhNjas0pDzAli6PgKjZ3ORirvGBUWIdS9g3YxJwdH/3q84T3+NHRfwWhRSCxAq7OjzLywgv69YGYhfXBU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279258; c=relaxed/simple; bh=wv1wAz5G5jTk9iKfTQXieVLbuRkIyBCE8b6i9HhVL3g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nYaUxNz1fvoNi3oZfB3T9HJR23XfOBFh1Dp3e0g9p2HwqK6UK13L8uxGUIRY/zL6VJxgUPMMXQPC9ONsRncB8mPNZ3uDnX8nQV57ci1JSOw2lCOe5urZCIKir/7IjmAtgwImlYHqe4MLR9cdyZ0iX25JDcKdgIpguES9SKB7O1o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com; spf=pass smtp.mailfrom=cipherat.com; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b=tuqtFvm6; arc=none smtp.client-ip=91.98.42.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cipherat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b="tuqtFvm6" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 8EDCC84FCD; Sat, 9 May 2026 01:27:33 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1778279254; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=Ys2ruBN+FMlbNaJuod+QMjGTvoSg6mzg3rPSjZ68TBE=; b=tuqtFvm6KTJl5/qzRW7fhe42zBoe4FD3UZeLp8MdboW67hFgulvOE+VP3KKkT1pj50/WV3 FSA4Wq58k/npugKatLbTuEeg3N1EXEFq+7alVFSi36Ume66TweC6xCkehCqNGIFOs7l6+L QJ1Bn9v0kUR1aQy8IorXihRwisXF7/7L82DSjkx/eXATP6nMfdJwxJguw6uYrsGTrVp37a Fi6JNq+hu3fEh7IDddul/l3Q02OyAFuxAt7s4PW1coL4eTYbYM2Ntwk5Bri/EBcvCtD4b5 NGjitc1RmSVgwftxsU1JI8hv2g3Eyws/VPY38fNwY9iw602WswM0uXm3EIa/VWFJE2Mq30 Air4wdU0Py6pCH66r3V9ntJr7b5sp5JPflOnabz1yYkLck9emBzEYnJ5vGoeszFoOhgjkA kuyPlkmE24ZCO6QYoGGtrWyfs8Qlc1TMk9CO2JcCfggq5tnKul+4gz95ulrSZl2PDuxosH FwKBhQKZroLx9ZQYNo9oWJ7aBjy4gXgVI/QRTYcNc9B0wjM8sWquLTr6lP+5zqKO/q/7h3 UlGw5E9dXTAQHQMLClbfeI6Po60nygUN6tR6ejTP1xAZ2VjCD8NuHoqT8jyO1ZxiylUu0C XHROjKWmdwAN4HQ+2r/51jVHRxJukyoFQFKd+t8P2eva18d0cvCVc= From: Salman Alghamdi To: gregkh@linuxfoundation.org Cc: straube.linux@gmail.com, error27@gmail.com, luka.gejak@linux.dev, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v7 2/7] staging: rtl8723bs: rtw_mlme: wrap lines exceeding 100 columns Date: Sat, 9 May 2026 01:26:58 +0300 Message-ID: <20260508222725.24075-3-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260508222725.24075-1-me@cipherat.com> References: <20260508222725.24075-1-me@cipherat.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 X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" Wrap long lines to bring them within the 100 column limit. No functional changes. Signed-off-by: Salman Alghamdi --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 205 +++++++++++++++------- 1 file changed, 142 insertions(+), 63 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 9f21a2226dbd..a35d726b803c 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -52,7 +52,10 @@ int rtw_init_mlme_priv(struct adapter *padapter) pmlmepriv->pscanned =3D NULL; pmlmepriv->fw_state =3D WIFI_STATION_STATE; /* Must sync with rtw_wdev_a= lloc() */ pmlmepriv->cur_network.network.infrastructure_mode =3D Ndis802_11AutoUnkn= own; - pmlmepriv->scan_mode =3D SCAN_ACTIVE;/* 1: active, 0: passive. Maybe som= eday we should rename this varable to "active_mode" (Jeff) */ + /* 1: active, 0: passive. Maybe someday we should rename this variable + * to "active_mode" (Jeff) + */ + pmlmepriv->scan_mode =3D SCAN_ACTIVE; =20 spin_lock_init(&pmlmepriv->lock); INIT_LIST_HEAD(&pmlmepriv->free_bss_pool.queue); @@ -125,7 +128,8 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlme= priv) rtw_free_mlme_ie_data(&pmlmepriv->p2p_beacon_ie, &pmlmepriv->p2p_beacon_i= e_len); rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_req_ie, &pmlmepriv->p2p_probe= _req_ie_len); rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_resp_ie, &pmlmepriv->p2p_prob= e_resp_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->p2p_go_probe_resp_ie, &pmlmepriv->p2p_g= o_probe_resp_ie_len); + rtw_free_mlme_ie_data(&pmlmepriv->p2p_go_probe_resp_ie, + &pmlmepriv->p2p_go_probe_resp_ie_len); rtw_free_mlme_ie_data(&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc= _req_ie_len); } =20 @@ -369,7 +373,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct w= lan_bssid_ex *dst, u8 fea (d_cap & WLAN_CAPABILITY_ESS)); } =20 -struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue,= struct wlan_network *network) +struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue, + struct wlan_network *network) { struct list_head *phead, *plist; struct wlan_network *found =3D NULL; @@ -420,7 +425,8 @@ void update_network(struct wlan_bssid_ex *dst, struct w= lan_bssid_ex *src, long rssi_final; =20 /* The rule below is 1/5 for sample value, 4/5 for history value */ - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) && is_same_network(&pa= dapter->mlmepriv.cur_network.network, src, 0)) { + if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) && + is_same_network(&padapter->mlmepriv.cur_network.network, src, 0)) { /* Take the recvpriv's value for the connected AP*/ ss_final =3D padapter->recvpriv.signal_strength; sq_final =3D padapter->recvpriv.signal_qual; @@ -431,11 +437,15 @@ void update_network(struct wlan_bssid_ex *dst, struct= wlan_bssid_ex *src, rssi_final =3D rssi_ori; } else { if (sq_smp !=3D 101) { /* from the right channel */ - ss_final =3D ((u32)(src->phy_info.signal_strength) + (u32)(dst->phy_inf= o.signal_strength) * 4) / 5; - sq_final =3D ((u32)(src->phy_info.signal_quality) + (u32)(dst->phy_info= .signal_quality) * 4) / 5; + ss_final =3D ((u32)(src->phy_info.signal_strength) + + (u32)(dst->phy_info.signal_strength) * 4) / 5; + sq_final =3D ((u32)(src->phy_info.signal_quality) + + (u32)(dst->phy_info.signal_quality) * 4) / 5; rssi_final =3D (src->rssi + dst->rssi * 4) / 5; } else { - /* bss info not receiving from the right channel, use the original RX s= ignal infos */ + /* bss info not receiving from the right channel, + * use the original RX signal infos + */ ss_final =3D dst->phy_info.signal_strength; sq_final =3D dst->phy_info.signal_quality; rssi_final =3D dst->rssi; @@ -462,7 +472,8 @@ static void update_current_network(struct adapter *adap= ter, struct wlan_bssid_ex &pmlmepriv->cur_network.network, &pmlmepriv->cur_network.network); =20 - if (check_fwstate(pmlmepriv, _FW_LINKED) && (is_same_network(&pmlmepriv->= cur_network.network, pnetwork, 0))) { + if (check_fwstate(pmlmepriv, _FW_LINKED) && + (is_same_network(&pmlmepriv->cur_network.network, pnetwork, 0))) { update_network(&pmlmepriv->cur_network.network, pnetwork, adapter, true); if (pmlmepriv->cur_network.network.ie_length < sizeof(struct ndis_802_11= _fix_ie)) return; @@ -606,7 +617,9 @@ static bool rtw_is_desired_network(struct adapter *adap= ter, struct wlan_network if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) { if (pnetwork->network.ie_length < _FIXED_IE_LENGTH_) return false; - if (rtw_get_wps_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, pnetwork->= network.ie_length - _FIXED_IE_LENGTH_, NULL, &wps_ielen)) + if (rtw_get_wps_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, + pnetwork->network.ie_length - _FIXED_IE_LENGTH_, + NULL, &wps_ielen)) return true; else return false; @@ -622,7 +635,9 @@ static bool rtw_is_desired_network(struct adapter *adap= ter, struct wlan_network if (pnetwork->network.ie_length < _BEACON_IE_OFFSET_) { bselected =3D false; } else { - p =3D rtw_get_ie(pnetwork->network.ies + _BEACON_IE_OFFSET_, WLAN_EID_= RSN, &ie_len, (pnetwork->network.ie_length - _BEACON_IE_OFFSET_)); + p =3D rtw_get_ie(pnetwork->network.ies + _BEACON_IE_OFFSET_, + WLAN_EID_RSN, &ie_len, + (pnetwork->network.ie_length - _BEACON_IE_OFFSET_)); if (p && ie_len > 0) bselected =3D true; else @@ -663,12 +678,14 @@ void rtw_survey_event_callback(struct adapter *adapte= r, u8 *pbuf) =20 /* update IBSS_network 's timestamp */ if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) { - if (!memcmp(&pmlmepriv->cur_network.network.mac_address, pnetwork->mac_a= ddress, ETH_ALEN)) { + if (!memcmp(&pmlmepriv->cur_network.network.mac_address, + pnetwork->mac_address, ETH_ALEN)) { struct wlan_network *ibss_wlan =3D NULL; =20 memcpy(pmlmepriv->cur_network.network.ies, pnetwork->ies, 8); spin_lock_bh(&pmlmepriv->scanned_queue.lock); - ibss_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->ma= c_address); + ibss_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + pnetwork->mac_address); if (ibss_wlan) { memcpy(ibss_wlan->network.ies, pnetwork->ies, 8); spin_unlock_bh(&pmlmepriv->scanned_queue.lock); @@ -722,10 +739,13 @@ void rtw_surveydone_event_callback(struct adapter *ad= apter, u8 *pbuf) struct wlan_bssid_ex *pdev_network =3D &adapter->registrypriv.dev_= network; u8 *pibss =3D adapter->registrypriv.dev_network.mac_address; =20 - /* pmlmepriv->fw_state ^=3D _FW_UNDER_SURVEY;because don't set assoc_= timer */ + /* pmlmepriv->fw_state ^=3D _FW_UNDER_SURVEY; + * because don't set assoc_timer + */ _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); =20 - memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndi= s_802_11_ssid)); + memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, + sizeof(struct ndis_802_11_ssid)); =20 rtw_update_registrypriv_dev_network(adapter); rtw_generate_random_ibss(pibss); @@ -957,7 +977,8 @@ void rtw_scan_abort(struct adapter *adapter) pmlmeext->scan_abort =3D false; } =20 -static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapte= r, struct wlan_network *pnetwork) +static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapte= r, + struct wlan_network *pnetwork) { int i; struct sta_info *bmc_sta, *psta =3D NULL; @@ -1014,7 +1035,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(st= ruct adapter *padapter, str } =20 /* for A-MPDU Rx reordering buffer control for bmc_sta & sta_info */ - /* if A-MPDU Rx is enabled, resetting rx_ordering_ctrl wstart_b(indicat= e_seq) to default value =3D 0xffff */ + /* if A-MPDU Rx is enabled, resetting rx_ordering_ctrl + * wstart_b(indicate_seq) to default value =3D 0xffff + */ /* todo: check if AP can send A-MPDU packets */ for (i =3D 0; i < 16 ; i++) { preorder_ctrl =3D &psta->recvreorder_ctrl[i]; @@ -1031,7 +1054,8 @@ static struct sta_info *rtw_joinbss_update_stainfo(st= ruct adapter *padapter, str preorder_ctrl->enable =3D false; preorder_ctrl->indicate_seq =3D 0xffff; preorder_ctrl->wend_b =3D 0xffff; - preorder_ctrl->wsize_b =3D 64;/* max_ampdu_sz;ex. 32(kbytes) -> wsize_= b =3D32 */ + /* max_ampdu_sz;ex. 32(kbytes) -> wsize_b =3D32 */ + preorder_ctrl->wsize_b =3D 64; } } } @@ -1041,7 +1065,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(st= ruct adapter *padapter, str =20 /* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ -static void rtw_joinbss_update_network(struct adapter *padapter, struct wl= an_network *ptarget_wlan, struct wlan_network *pnetwork) +static void rtw_joinbss_update_network(struct adapter *padapter, + struct wlan_network *ptarget_wlan, + struct wlan_network *pnetwork) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct wlan_network *cur_network =3D &pmlmepriv->cur_network; @@ -1058,7 +1084,9 @@ static void rtw_joinbss_update_network(struct adapter= *padapter, struct wlan_net =20 padapter->recvpriv.signal_strength =3D ptarget_wlan->network.phy_info.sig= nal_strength; padapter->recvpriv.signal_qual =3D ptarget_wlan->network.phy_info.signal_= quality; - /* the ptarget_wlan->network.rssi is raw data, we use ptarget_wlan->netwo= rk.phy_info.signal_strength instead (has scaled) */ + /* the ptarget_wlan->network.rssi is raw data, we use + * ptarget_wlan->network.phy_info.signal_strength instead (has scaled) + */ padapter->recvpriv.rssi =3D translate_percentage_to_dbm(ptarget_wlan->net= work.phy_info.signal_strength); =20 rtw_set_signal_stat_timer(&padapter->recvpriv); @@ -1084,10 +1112,12 @@ static void rtw_joinbss_update_network(struct adapt= er *padapter, struct wlan_net if (cur_network->network.ie_length < sizeof(struct ndis_802_11_fix_ie)) return; =20 - rtw_update_protection(padapter, (cur_network->network.ies) + sizeof(struc= t ndis_802_11_fix_ie), - (cur_network->network.ie_length - sizeof(struct ndis_802_11_fix_i= e))); + rtw_update_protection(padapter, + (cur_network->network.ies) + sizeof(struct ndis_802_11_fix_ie), + (cur_network->network.ie_length - sizeof(struct ndis_802_11_fix_i= e))); =20 - rtw_update_ht_cap(padapter, cur_network->network.ies, cur_network->networ= k.ie_length, (u8) cur_network->network.configuration.ds_config); + rtw_update_ht_cap(padapter, cur_network->network.ies, cur_network->networ= k.ie_length, + (u8)cur_network->network.configuration.ds_config); } =20 static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE]; @@ -1107,9 +1137,12 @@ void rtw_reset_securitypriv(struct adapter *adapter) /* We have to backup the PMK information for WiFi PMK Caching test item= . */ /* */ /* Backup the btkip_countermeasure information. */ - /* When the countermeasure is trigger, the driver have to disconnect wi= th AP for 60 seconds. */ + /* When the countermeasure is trigger, the driver have + * to disconnect with AP for 60 seconds. + */ =20 - memcpy(&backupPMKIDList[0], &adapter->securitypriv.PMKIDList[0], sizeof(= struct rt_pmkid_list) * NUM_PMKID_CACHE); + memcpy(&backupPMKIDList[0], &adapter->securitypriv.PMKIDList[0], + sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); backupPMKIDIndex =3D adapter->securitypriv.PMKIDIndex; backupTKIPCountermeasure =3D adapter->securitypriv.btkip_countermeasure; backupTKIPcountermeasure_time =3D adapter->securitypriv.btkip_countermea= sure_time; @@ -1120,8 +1153,11 @@ void rtw_reset_securitypriv(struct adapter *adapter) memset((unsigned char *)&adapter->securitypriv, 0, sizeof(struct securit= y_priv)); =20 /* Added by Albert 2009/02/18 */ - /* Restore the PMK information to securitypriv structure for the follow= ing connection. */ - memcpy(&adapter->securitypriv.PMKIDList[0], &backupPMKIDList[0], sizeof(= struct rt_pmkid_list) * NUM_PMKID_CACHE); + /* Restore the PMK information to securitypriv structure + * for the following connection. + */ + memcpy(&adapter->securitypriv.PMKIDList[0], &backupPMKIDList[0], + sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); adapter->securitypriv.PMKIDIndex =3D backupPMKIDIndex; adapter->securitypriv.btkip_countermeasure =3D backupTKIPCountermeasure; adapter->securitypriv.btkip_countermeasure_time =3D backupTKIPcountermea= sure_time; @@ -1153,9 +1189,13 @@ void rtw_reset_securitypriv(struct adapter *adapter) /* Notes: the function could be > passive_level (the same context as Rx ta= sklet) */ /* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ -/* if join_res > 0, for (fw_state =3D=3DWIFI_STATION_STATE), we check if = "ptarget_sta" & "ptarget_wlan" exist. */ +/* if join_res > 0, for (fw_state =3D=3DWIFI_STATION_STATE), we check + * if "ptarget_sta" & "ptarget_wlan" exist. + */ /* if join_res > 0, for (fw_state =3D=3DWIFI_ADHOC_STATE), we only check i= f "ptarget_wlan" exist. */ -/* if join_res > 0, update "cur_network->network" from "pnetwork->network"= if (ptarget_wlan !=3D NULL). */ +/* if join_res > 0, update "cur_network->network" from + * "pnetwork->network" if (ptarget_wlan !=3D NULL). + */ /* */ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) { @@ -1167,7 +1207,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) struct wlan_network *pcur_wlan =3D NULL, *ptarget_wlan =3D NULL; unsigned int the_same_macaddr =3D false; =20 - the_same_macaddr =3D !memcmp(pnetwork->network.mac_address, cur_network->= network.mac_address, ETH_ALEN); + the_same_macaddr =3D !memcmp(pnetwork->network.mac_address, + cur_network->network.mac_address, ETH_ALEN); =20 pnetwork->network.length =3D get_wlan_bssid_ex_sz(&pnetwork->network); if (pnetwork->network.length > sizeof(struct wlan_bssid_ex)) @@ -1207,9 +1248,11 @@ void rtw_joinbss_event_prehandle(struct adapter *ada= pter, u8 *pbuf) /* s1. find ptarget_wlan */ if (check_fwstate(pmlmepriv, _FW_LINKED)) { if (the_same_macaddr) { - ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, cur_networ= k->network.mac_address); + ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + cur_network->network.mac_address); } else { - pcur_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, cur_network->= network.mac_address); + pcur_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + cur_network->network.mac_address); if (pcur_wlan) pcur_wlan->fixed =3D false; =20 @@ -1217,7 +1260,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) if (pcur_sta) rtw_free_stainfo(adapter, pcur_sta); =20 - ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->= network.mac_address); + ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + pnetwork->network.mac_address); if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { if (ptarget_wlan) ptarget_wlan->fixed =3D true; @@ -1242,7 +1286,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) =20 rtw_joinbss_update_network(adapter, ptarget_wlan, pnetwork); =20 - /* s3. find ptarget_sta & update ptarget_sta after update cur_network onl= y for station mode */ + /* s3. find ptarget_sta & update ptarget_sta after update + * cur_network only for station mode + */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { ptarget_sta =3D rtw_joinbss_update_stainfo(adapter, pnetwork); if (!ptarget_sta) { @@ -1310,7 +1356,8 @@ void rtw_stassoc_event_callback(struct adapter *adapt= er, u8 *pbuf) /* report to upper layer */ spin_lock_bh(&psta->lock); if (psta->passoc_req && psta->assoc_req_len > 0) { - passoc_req =3D kmemdup(psta->passoc_req, psta->assoc_req_len, GFP_ATOM= IC); + passoc_req =3D kmemdup(psta->passoc_req, + psta->assoc_req_len, GFP_ATOMIC); if (passoc_req) { assoc_req_len =3D psta->assoc_req_len; =20 @@ -1335,7 +1382,10 @@ void rtw_stassoc_event_callback(struct adapter *adap= ter, u8 *pbuf) if (psta) { /* the sta have been in sta_info_queue =3D> do nothing */ =20 - return; /* between drv has received this event before and fw have not y= et to set key to CAM_ENTRY) */ + /* between drv has received this event before and + * fw have not yet to set key to CAM_ENTRY) + */ + return; } =20 psta =3D rtw_alloc_stainfo(&adapter->stapriv, pstassoc->macaddr); @@ -1362,7 +1412,8 @@ void rtw_stassoc_event_callback(struct adapter *adapt= er, u8 *pbuf) check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { if (adapter->stapriv.asoc_sta_count =3D=3D 2) { spin_lock_bh(&pmlmepriv->scanned_queue.lock); - ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, cur_networ= k->network.mac_address); + ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + cur_network->network.mac_address); pmlmepriv->cur_network_scanned =3D ptarget_wlan; if (ptarget_wlan) ptarget_wlan->fixed =3D true; @@ -1419,16 +1470,19 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *pbuf) =20 if (adapter->registrypriv.wifi_spec =3D=3D 1) { roam =3D false; - } else if (reason =3D=3D WLAN_REASON_EXPIRATION_CHK && rtw_chk_roam_flag= s(adapter, RTW_ROAM_ON_EXPIRED)) { + } else if (reason =3D=3D WLAN_REASON_EXPIRATION_CHK && + rtw_chk_roam_flags(adapter, RTW_ROAM_ON_EXPIRED)) { roam =3D true; - } else if (reason =3D=3D WLAN_REASON_ACTIVE_ROAM && rtw_chk_roam_flags(a= dapter, RTW_ROAM_ACTIVE)) { + } else if (reason =3D=3D WLAN_REASON_ACTIVE_ROAM && + rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) { roam =3D true; roam_target =3D pmlmepriv->roam_network; } =20 if (roam) { if (rtw_to_roam(adapter) > 0) - rtw_dec_to_roam(adapter); /* this stadel_event is caused by roaming, d= ecrease to_roam */ + /* this stadel_event is caused by roaming, decrease to_roam */ + rtw_dec_to_roam(adapter); else if (rtw_to_roam(adapter) =3D=3D 0) rtw_set_to_roam(adapter, adapter->registrypriv.max_roaming_times); } else { @@ -1442,7 +1496,8 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *pbuf) =20 spin_lock_bh(&pmlmepriv->scanned_queue.lock); /* remove the network entry in scanned_queue */ - pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->netwo= rk.mac_address); + pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + tgt_network->network.mac_address); if (pwlan) { pwlan->fixed =3D false; rtw_free_network_nolock(adapter, pwlan); @@ -1456,12 +1511,14 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *pbuf) check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { rtw_free_stainfo(adapter, psta); =20 - if (adapter->stapriv.asoc_sta_count =3D=3D 1) {/* a sta + bc/mc_stainfo = (not Ibss_stainfo) */ + /* a sta + bc/mc_stainfo (not Ibss_stainfo) */ + if (adapter->stapriv.asoc_sta_count =3D=3D 1) { u8 ret =3D _SUCCESS; =20 spin_lock_bh(&pmlmepriv->scanned_queue.lock); /* free old ibss network */ - pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->netw= ork.mac_address); + pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + tgt_network->network.mac_address); if (pwlan) { pwlan->fixed =3D false; rtw_free_network_nolock(adapter, pwlan); @@ -1471,9 +1528,11 @@ void rtw_stadel_event_callback(struct adapter *adapt= er, u8 *pbuf) pdev_network =3D &adapter->registrypriv.dev_network; pibss =3D adapter->registrypriv.dev_network.mac_address; =20 - memcpy(pdev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_n= etwork->network)); + memcpy(pdev_network, &tgt_network->network, + get_wlan_bssid_ex_sz(&tgt_network->network)); =20 - memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_= 802_11_ssid)); + memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, + sizeof(struct ndis_802_11_ssid)); =20 rtw_update_registrypriv_dev_network(adapter); =20 @@ -1544,7 +1603,9 @@ void _rtw_join_timeout_handler(struct timer_list *t) rtw_indicate_disconnect(adapter); free_scanqueue(pmlmepriv);/* */ =20 - /* indicate disconnect for the case that join_timeout and check_fwstate = !=3D FW_LINKED */ + /* indicate disconnect for the case that join_timeout + * and check_fwstate !=3D FW_LINKED + */ rtw_cfg80211_indicate_disconnect(adapter); } =20 @@ -1593,8 +1654,8 @@ static void rtw_auto_scan_handler(struct adapter *pad= apter) =20 rtw_mlme_reset_auto_scan_int(padapter); =20 - if (pmlmepriv->auto_scan_int_ms !=3D 0 - && jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time) > pmlmepriv->a= uto_scan_int_ms) { + if (pmlmepriv->auto_scan_int_ms !=3D 0 && + jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time) > pmlmepriv->a= uto_scan_int_ms) { if (!padapter->registrypriv.wifi_spec) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) goto exit; @@ -1636,7 +1697,9 @@ void rtw_dynamic_check_timer_handler(struct adapter *= adapter) /* rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_ENTER, 1); */ rtw_hal_dm_watchdog_in_lps(adapter); } else { - /* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) in traffic_sta= tus_watchdog() */ + /* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) + * in traffic_status_watchdog() + */ } =20 } else { @@ -1769,8 +1832,9 @@ static int rtw_check_join_candidate(struct mlme_priv = *mlme =20 /* check ssid, if needed */ if (mlme->assoc_ssid.ssid[0] && mlme->assoc_ssid.ssid_length) { - if (competitor->network.ssid.ssid_length !=3D mlme->assoc_ssid.ssid_leng= th - || memcmp(competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, mlme->a= ssoc_ssid.ssid_length) + if (competitor->network.ssid.ssid_length !=3D mlme->assoc_ssid.ssid_leng= th || + memcmp(competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, + mlme->assoc_ssid.ssid_length) ) goto exit; } @@ -1888,7 +1952,8 @@ signed int rtw_set_auth(struct adapter *adapter, stru= ct security_priv *psecurity return res; } =20 -signed int rtw_set_key(struct adapter *adapter, struct security_priv *psec= uritypriv, signed int keyid, u8 set_tx, bool enqueue) +signed int rtw_set_key(struct adapter *adapter, struct security_priv *psec= uritypriv, + signed int keyid, u8 set_tx, bool enqueue) { u8 keylen; struct cmd_obj *pcmd; @@ -1963,7 +2028,8 @@ signed int rtw_set_key(struct adapter *adapter, struc= t security_priv *psecurityp } =20 /* adjust ies for rtw_joinbss_cmd in WMM */ -int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, ui= nt in_len, uint initial_out_len) +int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, + uint in_len, uint initial_out_len) { unsigned int ielength =3D 0; unsigned int i, j; @@ -2097,7 +2163,8 @@ signed int rtw_restruct_sec_ie(struct adapter *adapte= r, u8 *in_ie, u8 *out_ie, u ielength +=3D psecuritypriv->wps_ie_len; } else if ((authmode =3D=3D WLAN_EID_VENDOR_SPECIFIC) || (authmode =3D=3D= WLAN_EID_RSN)) { /* copy RSN or SSN */ - memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypri= v->supplicant_ie[1] + 2); + memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], + psecuritypriv->supplicant_ie[1] + 2); ielength +=3D psecuritypriv->supplicant_ie[1] + 2; rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie); } @@ -2135,7 +2202,8 @@ void rtw_update_registrypriv_dev_network(struct adapt= er *adapter) struct security_priv *psecuritypriv =3D &adapter->securitypriv; struct wlan_network *cur_network =3D &adapter->mlmepriv.cur_network; =20 - pdev_network->privacy =3D (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0= ) ; /* adhoc no 802.1x */ + /* adhoc no 802.1x */ + pdev_network->privacy =3D (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0= ); =20 pdev_network->rssi =3D 0; =20 @@ -2165,14 +2233,18 @@ void rtw_update_registrypriv_dev_network(struct ada= pter *adapter) /* 1. Supported rates */ /* 2. IE */ =20 - /* rtw_set_supported_rate(pdev_network->supported_rates, pregistrypriv->w= ireless_mode) ; will be called in rtw_generate_ie */ + /* rtw_set_supported_rate(pdev_network->supported_rates, pregistrypriv->w= ireless_mode); + * will be called in rtw_generate_ie + */ sz =3D rtw_generate_ie(pregistrypriv); =20 pdev_network->ie_length =3D sz; =20 pdev_network->length =3D get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pd= ev_network); =20 - /* notes: translate ie_length & length after assign the length to cmdsz i= n createbss_cmd(); */ + /* notes: translate ie_length & length after assign the + * length to cmdsz in createbss_cmd(); + */ /* pdev_network->ie_length =3D cpu_to_le32(sz); */ } =20 @@ -2184,7 +2256,9 @@ void rtw_joinbss_reset(struct adapter *padapter) =20 struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; =20 - /* todo: if you want to do something io/reg/hw setting before join_bss, p= lease add code here */ + /* todo: if you want to do something io/reg/hw setting before + * join_bss, please add code here + */ =20 pmlmepriv->num_FortyMHzIntolerant =3D 0; =20 @@ -2274,7 +2348,8 @@ void rtw_build_wmm_ie_ht(struct adapter *padapter, u8= *out_ie, uint *pout_len) } =20 /* the function is >=3D passive_level */ -unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8= *out_ie, uint in_len, uint *pout_len, u8 channel) +unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8= *out_ie, + uint in_len, uint *pout_len, u8 channel) { u32 ielen, out_len; enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor; @@ -2345,7 +2420,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *pa= dapter, u8 *in_ie, u8 *out_ ht_capie.cap_info |=3D cpu_to_le16(IEEE80211_HT_CAP_SM_PS); =20 if (TEST_FLAG(phtpriv->stbc_cap, STBC_HT_ENABLE_RX)) { - if ((channel <=3D 14 && pregistrypriv->rx_stbc =3D=3D 0x1) || /* enable = for 2.4GHz */ + if ((channel <=3D 14 && pregistrypriv->rx_stbc =3D=3D 0x1) || /* enable = for 2.4GHz */ (pregistrypriv->wifi_spec =3D=3D 1)) stbc_rx_enable =3D 1; } @@ -2355,7 +2430,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *pa= dapter, u8 *in_ie, u8 *out_ =20 /* update default supported_mcs_set */ if (stbc_rx_enable) - ht_capie.cap_info |=3D cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_1R);/* RX ST= BC One spatial stream */ + /* RX STBC One spatial stream */ + ht_capie.cap_info |=3D cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_1R); =20 set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_1R); =20 @@ -2421,7 +2497,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *= pie, uint ie_len, u8 channe =20 /* check Max Rx A-MPDU Size */ len =3D 0; - p =3D rtw_get_ie(pie + sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_CAP= ABILITY, &len, ie_len - sizeof(struct ndis_802_11_fix_ie)); + p =3D rtw_get_ie(pie + sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_CAP= ABILITY, + &len, ie_len - sizeof(struct ndis_802_11_fix_ie)); if (p && len > 0) { pht_capie =3D (struct ieee80211_ht_cap *)(p + 2); max_ampdu_sz =3D (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_= FACTOR); @@ -2431,7 +2508,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *= pie, uint ie_len, u8 channe } =20 len =3D 0; - p =3D rtw_get_ie(pie + sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_OPE= RATION, &len, ie_len - sizeof(struct ndis_802_11_fix_ie)); + p =3D rtw_get_ie(pie + sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_OPE= RATION, + &len, ie_len - sizeof(struct ndis_802_11_fix_ie)); if (p && len > 0) { /* todo: */ } @@ -2564,7 +2642,8 @@ void _rtw_roaming(struct adapter *padapter, struct wl= an_network *tgt_network) struct wlan_network *cur_network =3D &pmlmepriv->cur_network; =20 if (rtw_to_roam(padapter) > 0) { - memcpy(&pmlmepriv->assoc_ssid, &cur_network->network.ssid, sizeof(struct= ndis_802_11_ssid)); + memcpy(&pmlmepriv->assoc_ssid, &cur_network->network.ssid, + sizeof(struct ndis_802_11_ssid)); =20 pmlmepriv->assoc_by_bssid =3D false; =20 --=20 2.54.0 From nobody Sat Jun 13 07:45:37 2026 Received: from mail.cipherat.com (mail.cipherat.com [91.98.42.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3942390230 for ; Fri, 8 May 2026 22:27:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.98.42.103 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279259; cv=none; b=YasMIK8G1UV9ZpVg8OJtacBGEhWFaXSJaWAaikb1Z31jt1U15BIUpP8OwVcmHrYc//LQZpVb6vjQrgT/ZLYdbIhXvoFj+riSo402dYz2He1vQFkjUFGLzhfOBopnk9e1E5B03LsjoAqK55JzyL412YpCWv0din1LuoeFCHm6XXo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279259; c=relaxed/simple; bh=9HdIemgfR4VrPqTNiZHWFj+ptqaf+4Vv3NXR+2U51Wk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UXKTgrRp8pUkNeoUd7Ko7SxAA8djuIpo0joBw2GLnUSskSdWbBpmMXWOZphJbYOME9d/2WFYd3Q6j3lfvH795VkRnxCNN6p1SzXxb3bcHeEho37Kv7yzCTjDPVxapBHAgwo+ePBJuREhwgGXT8kpvFpltw5k7QxjaDbW4f1lUKg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com; spf=pass smtp.mailfrom=cipherat.com; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b=DGwexo9u; arc=none smtp.client-ip=91.98.42.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cipherat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b="DGwexo9u" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 8289784FCE; Sat, 9 May 2026 01:27:35 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1778279255; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=3j1c5EDJo/k0wJE4iA56/aLTF1LlfKvBBoU57CDpPI0=; b=DGwexo9uOFrIeZ6tUe4UlhySX8Z4BtkOepcdhkImoXtUJEczZzvZDHpKw4j2IaSmPfG41v sIuMDY4fsTstfRDh6mFws4aLdE11WF3Dt6HIRhRRTle2wkE1dfn0LlGWCBwIBhNW25vqhX /dZKodGtazYPWqw1CTHp80KPp5W+GrrSEg9rrOIQDDn5evoJ78kRJB0hHk85S39kqokg6Z 59M2afltFQE4aYMKB7TASEwld3NRol+E/0yAI3oFT47HnI2c5kYaTCFJ/IsK+kQMhqlgCi fhg3HMd3U/nT96+DVKaEjMVKht/dZFXPTkBOT0vmhN3z7q0voidNsigI/0PT1wPUA++oMV TNJUXJe2oyL0qt7mwSfypSLOf6l0yUcxjTSGDnNenfvRHpPKoJk2mqcE6cGDZn5roj5ttK hUZNVKdeR6scGRZ3BytSBH6TQShnS30abqTEJNN8MadirkVz+8R+FGluqBxXIjen9Nykv6 ONGSmuF66jS9DjypwLQ9rBXE8JwxNts7AhUsAsQVWw+uzGY+3/XHBJAbOe5bGJRVFpayMT Jhq+fZiYAMdXvTZQb55qoQQmqj/gbspHyML+5QLnTAoWgBDfBlcRAa/Zg1g4GSA3c8UXO4 znPncJguxEAekaBkzLeOmmB4TDvxkuKY28t+lkpRQcwffRM7DsulM= From: Salman Alghamdi To: gregkh@linuxfoundation.org Cc: straube.linux@gmail.com, error27@gmail.com, luka.gejak@linux.dev, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v7 3/7] staging: rtl8723bs: rtw_mlme: wrap rtw_sitesurvey_cmd condition Date: Sat, 9 May 2026 01:26:59 +0300 Message-ID: <20260508222725.24075-4-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260508222725.24075-1-me@cipherat.com> References: <20260508222725.24075-1-me@cipherat.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 X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" Inline rtw_sitesurvey_cmd() directly in the if condition to reduce line length. Signed-off-by: Salman Alghamdi --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index a35d726b803c..caaad38dd790 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -772,9 +772,9 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *pbuf) rtw_indicate_connect(adapter); } else { if (rtw_to_roam(adapter) !=3D 0) { - if (rtw_dec_to_roam(adapter) =3D=3D 0 - || _SUCCESS !=3D rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid,= 1, NULL, 0) - ) { + if (rtw_dec_to_roam(adapter) =3D=3D 0 || + rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid, + 1, NULL, 0) !=3D _SUCCESS) { rtw_set_to_roam(adapter, 0); rtw_free_assoc_resources(adapter, 1); rtw_indicate_disconnect(adapter); --=20 2.54.0 From nobody Sat Jun 13 07:45:37 2026 Received: from mail.cipherat.com (mail.cipherat.com [91.98.42.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36C79396B70 for ; Fri, 8 May 2026 22:27:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.98.42.103 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279261; cv=none; b=eipCgSfT+CpHHuyhEebmKW+ibHUDcew7AHSS8n6wCYKn3+igerPeP062MglMuykWRA58ZymXS5i00Oa5/kK8BhTRdH+G4VuQ0HCM/TBrC7FnQUjX5RjwbV6E2hJU3eu+V23CqJk4K8c+Su/U7yC1H3tdWESic6pDbeAYObqNPkw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279261; c=relaxed/simple; bh=6trcGTC37H9MXsMGUkJAY7fu3Qy9pHRpk0B1zV+YEQg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QB9LxIMq0WYOuefoHtqHIYaoFCtIu5tF7qw0+lCoc85KKxtrGwcnxg5kzVWpw13OdVO9wKqVTmbC/YhUoii93LW3n0DAYAWoec8oNaSXiBPoLfj80wzbn6GDNWE+UmXdMbhLSTbIVshYLgUWsb6J9hOWkHUbGxqmjyJV2L2eN8U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com; spf=pass smtp.mailfrom=cipherat.com; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b=ExtTltMb; arc=none smtp.client-ip=91.98.42.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cipherat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b="ExtTltMb" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id EF73084FCF; Sat, 9 May 2026 01:27:37 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1778279258; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=iOjXUmX/3LFVvlDQgBU1jNZBrZ14fTBb4/kiLAqbpb0=; b=ExtTltMbtKeY1QXxQ/uV/64KTfQoCQgyhqGpGyjAJ36VOuJTZJG7+EP7rhcvLwzu0ICgCo CTGdweqP7okP5QHAXLlg7I+1XC26Kzc9uRb9SZfP5L9f3sJShKY6Vh3fJqdiuGiGk9+kFj tGp7P9t2m/TgL/JEytQeNGRybq0u3sRi60oYRIjUGg7a1eo1MnkFEL/IwoEOiMgfeNtubI kwjfJqdlLq0+IOiYu5LBWDaNaxvCviW5V+AUAJ1yzO0u36ljig3qGNMInriBRytmhM32ee amDmSrOWj1+C/5n/obG/TbMxxlZnvyBaqbm1b0nzODBA+RNWdDBHxWOzJk14k+Ov54p/mL YaU71y46z/r5W39ZoBB6Mhq3cAwVaIe/P9R1Wr6jK6WCVEZx0KU3PTu8V3zsuXKqR0aiAm 1yOJnIf4GBlfuwf6B1emDcTAzu+aEdEgD/4xBD8u08yXXGqguEhnO8/qr35w12u34pyY3e L9F9wL6nfn67GOyvnI/T3bN4VEH0Y5ZxPWvMt5Ca+9ie5SGORSvH3PMxlELck/x6S+Cw45 ORLrSD8JHHk2WGsrMh5s8vdgNAMVxlvaQ+sCu+UMP0FXGXpuE6ejGQgtuaux15yZT9OrKb YyCtsYhl6MCumn4dbMhhvnOVWRSn33rl5ul/MmtrMhcStPDsaYAqE= From: Salman Alghamdi To: gregkh@linuxfoundation.org Cc: straube.linux@gmail.com, error27@gmail.com, luka.gejak@linux.dev, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v7 4/7] staging: rtl8723bs: rtw_mlme: extract local variables for long expressions Date: Sat, 9 May 2026 01:27:00 +0300 Message-ID: <20260508222725.24075-5-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260508222725.24075-1-me@cipherat.com> References: <20260508222725.24075-1-me@cipherat.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 X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" Extract local variables to shorten lines that cannot be wrapped cleanly. Signed-off-by: Salman Alghamdi --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 47 +++++++++++++++-------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index caaad38dd790..9582d9704393 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -474,12 +474,16 @@ static void update_current_network(struct adapter *ad= apter, struct wlan_bssid_ex =20 if (check_fwstate(pmlmepriv, _FW_LINKED) && (is_same_network(&pmlmepriv->cur_network.network, pnetwork, 0))) { + u32 ie_len; + u8 *ie; + update_network(&pmlmepriv->cur_network.network, pnetwork, adapter, true); - if (pmlmepriv->cur_network.network.ie_length < sizeof(struct ndis_802_11= _fix_ie)) + ie_len =3D pmlmepriv->cur_network.network.ie_length; + if (ie_len < sizeof(struct ndis_802_11_fix_ie)) return; =20 - rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + si= zeof(struct ndis_802_11_fix_ie), - pmlmepriv->cur_network.network.ie_length - sizeof(struct ndis_802_= 11_fix_ie)); + ie =3D pmlmepriv->cur_network.network.ies + sizeof(struct ndis_802_11_fi= x_ie); + rtw_update_protection(adapter, ie, ie_len - sizeof(struct ndis_802_11_fi= x_ie)); } } =20 @@ -650,7 +654,13 @@ static bool rtw_is_desired_network(struct adapter *ada= pter, struct wlan_network bselected =3D false; =20 if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { - if (pnetwork->network.infrastructure_mode !=3D pmlmepriv->cur_network.ne= twork.infrastructure_mode) + enum ndis_802_11_network_infrastructure inf_mode; + enum ndis_802_11_network_infrastructure cur_inf; + + inf_mode =3D pnetwork->network.infrastructure_mode; + cur_inf =3D pmlmepriv->cur_network.network.infrastructure_mode; + + if (inf_mode !=3D cur_inf) bselected =3D false; } =20 @@ -735,9 +745,10 @@ void rtw_surveydone_event_callback(struct adapter *ada= pter, u8 *pbuf) if (rtw_select_and_join_from_scanned_queue(pmlmepriv) =3D=3D _SUCCESS)= { _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); } else { + struct registry_priv *regs =3D &adapter->registrypriv; + struct wlan_bssid_ex *pdev_network =3D ®s->dev_network; + u8 *pibss =3D regs->dev_network.mac_address; u8 ret =3D _SUCCESS; - struct wlan_bssid_ex *pdev_network =3D &adapter->registrypriv.dev_= network; - u8 *pibss =3D adapter->registrypriv.dev_network.mac_address; =20 /* pmlmepriv->fw_state ^=3D _FW_UNDER_SURVEY; * because don't set assoc_timer @@ -792,8 +803,10 @@ void rtw_surveydone_event_callback(struct adapter *ada= pter, u8 *pbuf) if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED)) { if (rtw_select_roaming_candidate(pmlmepriv) =3D=3D _SUCCESS) { - receive_disconnect(adapter, pmlmepriv->cur_network.network.mac_address - , WLAN_REASON_ACTIVE_ROAM); + u8 *mac_addr =3D pmlmepriv->cur_network.network.mac_address; + + receive_disconnect(adapter, mac_addr, + WLAN_REASON_ACTIVE_ROAM); } } } @@ -1069,6 +1082,7 @@ static void rtw_joinbss_update_network(struct adapter= *padapter, struct wlan_network *ptarget_wlan, struct wlan_network *pnetwork) { + u8 signal_strength =3D ptarget_wlan->network.phy_info.signal_strength; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct wlan_network *cur_network =3D &pmlmepriv->cur_network; =20 @@ -1082,12 +1096,12 @@ static void rtw_joinbss_update_network(struct adapt= er *padapter, =20 rtw_set_signal_stat_timer(&padapter->recvpriv); =20 - padapter->recvpriv.signal_strength =3D ptarget_wlan->network.phy_info.sig= nal_strength; + padapter->recvpriv.signal_strength =3D signal_strength; padapter->recvpriv.signal_qual =3D ptarget_wlan->network.phy_info.signal_= quality; /* the ptarget_wlan->network.rssi is raw data, we use * ptarget_wlan->network.phy_info.signal_strength instead (has scaled) */ - padapter->recvpriv.rssi =3D translate_percentage_to_dbm(ptarget_wlan->net= work.phy_info.signal_strength); + padapter->recvpriv.rssi =3D translate_percentage_to_dbm(signal_strength); =20 rtw_set_signal_stat_timer(&padapter->recvpriv); =20 @@ -1740,8 +1754,9 @@ void rtw_set_scan_deny(struct adapter *adapter, u32 m= s) static int rtw_check_roaming_candidate(struct mlme_priv *mlme , struct wlan_network **candidate, struct wlan_network *competitor) { - int updated =3D false; struct adapter *adapter =3D container_of(mlme, struct adapter, mlmepriv); + int updated =3D false; + long rssi_diff; =20 if (is_same_ess(&competitor->network, &mlme->cur_network.network) =3D=3D = false) goto exit; @@ -1759,7 +1774,8 @@ static int rtw_check_roaming_candidate(struct mlme_pr= iv *mlme if (jiffies_to_msecs(jiffies - competitor->last_scanned) >=3D mlme->roam_= scanr_exp_ms) goto exit; =20 - if (competitor->network.rssi - mlme->cur_network_scanned->network.rssi < = mlme->roam_rssi_diff_th) + rssi_diff =3D competitor->network.rssi - mlme->cur_network_scanned->netwo= rk.rssi; + if (rssi_diff < mlme->roam_rssi_diff_th) goto exit; =20 if (*candidate && (*candidate)->network.rssi >=3D competitor->network.rss= i) @@ -2133,7 +2149,7 @@ static void rtw_report_sec_ie(struct adapter *adapter= , u8 authmode, u8 *sec_ie) =20 wrqu.data.length =3D p - buff; =20 - wrqu.data.length =3D (wrqu.data.length < IW_CUSTOM_MAX) ? wrqu.data.leng= th : IW_CUSTOM_MAX; + wrqu.data.length =3D umin(wrqu.data.length, IW_CUSTOM_MAX); =20 kfree(buff); } @@ -2521,14 +2537,15 @@ void rtw_update_ht_cap(struct adapter *padapter, u8= *pie, uint ie_len, u8 channe if ((cbw40_enable) && (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & BIT(1)) && (pmlmeinfo->HT_info.infos[0] & BIT(2))) { + u8 *mcs_rate =3D pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate; int i; =20 /* update the MCS set */ for (i =3D 0; i < 16; i++) - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &=3D pmlmeext->default_= supported_mcs_set[i]; + mcs_rate[i] &=3D pmlmeext->default_supported_mcs_set[i]; =20 /* update the MCS rates */ - set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_R= ATE_1R); + set_mcs_rate_by_mask(mcs_rate, MCS_RATE_1R); =20 /* switch to the 40M Hz mode according to the AP */ /* pmlmeext->cur_bwmode =3D CHANNEL_WIDTH_40; */ --=20 2.54.0 From nobody Sat Jun 13 07:45:37 2026 Received: from mail.cipherat.com (mail.cipherat.com [91.98.42.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8880D394786 for ; Fri, 8 May 2026 22:27:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.98.42.103 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279264; cv=none; b=ckrSTnuU0ewCLYR+lyzwHPoOUwBXEB2hiflSA4nCXQMopTh+ErpP5HfSp4/dB4/cu8Gw/tBHhaOoDXkjawZ4T0KQJxAnnP45/2k4ZOTPih/PfNPuMSWzCLaPPJ67jjZy0yOV9bJcdPFVdDXUTQEnxP3SOwAlHOiL83LJH5RvdM4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279264; c=relaxed/simple; bh=aIV2EFGl8Rw3+pTqWtdl1K7zxN/9Zupq79LHIy59AHY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QfcpHPz03y13hoPk1urOBOaC5wxYR/PqisFnQLFAdLaAmMt0rnNf6jQxCPCZdActBVnYBh/Aeemg677vLQMsf7tdWRUEw6F4HECQEx1EObuilLLa4JLgJBh4RO9o1MzRyL8kTFp47yNKeGgMVXvW/HJrcFqjYlEKTUgMZYkNyfo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com; spf=pass smtp.mailfrom=cipherat.com; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b=Zj6ZQEat; arc=none smtp.client-ip=91.98.42.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cipherat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b="Zj6ZQEat" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 4F8DC84FCC; Sat, 9 May 2026 01:27:40 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1778279260; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=5nwBJM09V8VDtqet+QMNYG2G81ccmqT9GY2u6fEOuaM=; b=Zj6ZQEat302fsZ/ty9Pc+K5W8I2OTHiTlNod6ikxWPf7GjrLsBTa8MUP39u4zsH/8QJmRN 4HaVdhsgRCCO6W4qfCf+xh4Rj91HpZ4wjlcBa82Tq6USuBpQgAeNjkic2iNw2wykbe3Sju 2p0DoE2fvUKaKFUIRQSEwr6Pwv2j1SW1WemVJgf6Rl+nJt7zvV++GquTdl58ZYg1uFUcMa 8SyIJHEwd6HUhSmPGe72+vhIq56SNavs/0lR0xLc1FS29qzjDFU9gmoyAHJ9lReOkR02+j 4uUzn5QqJcGOP91H/ZONi/6Re0+cnLZJBV2dp5xgLJu5pywQKQzP+QgpiKurfpO4ePhurp J6HFWuVZ7WQ7TITyVwrlx3NVUzt/P1qkpwjo5m5ohmwEGUkbyoD5Ju34LWVTqxkS3xGnn/ en3s/LMyECvG3lxbOsX5a5K5CwQp9qK+CTHV6xPf+tEbQlFNRI08vlfwj+/u6sQOokV2XZ 5LE95OO2ILonI3JYc5d9oK3gXPYDfIaSuhqujFQReAdD79kV3uLyimI2qI1z95xVifV7yr hl+tO+KtfCJeFqRIa5Ip08co+iQqGIzwBfAkgr+a+YEXNNwkfRIwGP8Sitd6XdiwrVmxIC Cry7eDaPfNdt2KhUiqNf60utxtiqFkPNqqe4cyccpe77B6LI9pKPY= From: Salman Alghamdi To: gregkh@linuxfoundation.org Cc: straube.linux@gmail.com, error27@gmail.com, luka.gejak@linux.dev, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v7 5/7] staging: rtl8723bs: rtw_mlme: remove dead commented-out code Date: Sat, 9 May 2026 01:27:01 +0300 Message-ID: <20260508222725.24075-6-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260508222725.24075-1-me@cipherat.com> References: <20260508222725.24075-1-me@cipherat.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 X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" Remove commented-out code and its associated orphaned comments. Signed-off-by: Salman Alghamdi --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 9582d9704393..233675f3a045 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -750,9 +750,6 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *pbuf) u8 *pibss =3D regs->dev_network.mac_address; u8 ret =3D _SUCCESS; =20 - /* pmlmepriv->fw_state ^=3D _FW_UNDER_SURVEY; - * because don't set assoc_timer - */ _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); =20 memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, @@ -1707,14 +1704,8 @@ void rtw_dynamic_check_timer_handler(struct adapter = *adapter) linked_status_chk(adapter); =20 should_enter_ps =3D traffic_status_watchdog(adapter, true); - if (should_enter_ps) { - /* rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_ENTER, 1); */ + if (should_enter_ps) rtw_hal_dm_watchdog_in_lps(adapter); - } else { - /* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) - * in traffic_status_watchdog() - */ - } =20 } else { rtw_dynamic_chk_wk_cmd(adapter); @@ -2249,19 +2240,11 @@ void rtw_update_registrypriv_dev_network(struct ada= pter *adapter) /* 1. Supported rates */ /* 2. IE */ =20 - /* rtw_set_supported_rate(pdev_network->supported_rates, pregistrypriv->w= ireless_mode); - * will be called in rtw_generate_ie - */ sz =3D rtw_generate_ie(pregistrypriv); =20 pdev_network->ie_length =3D sz; =20 pdev_network->length =3D get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pd= ev_network); - - /* notes: translate ie_length & length after assign the - * length to cmdsz in createbss_cmd(); - */ - /* pdev_network->ie_length =3D cpu_to_le32(sz); */ } =20 /* the function is at passive_level */ --=20 2.54.0 From nobody Sat Jun 13 07:45:37 2026 Received: from mail.cipherat.com (mail.cipherat.com [91.98.42.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83C1C3921DD for ; Fri, 8 May 2026 22:27:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.98.42.103 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279267; cv=none; b=N/5+h5FDeFKC7IkExbzCKL4mSH+ti+TM128/dUYrvmcy07bjcGNqJ7eDtI9xseiaXCeuOO/3J0LamwnAtbzvNfXKd/d8EncDds1zD28cMzglSyaeZDafm8MgPIn7cdisZ/cyg4xAOO+PCaGBvipAZ1CMvd9vo6sIHJOQdBkgZ5A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279267; c=relaxed/simple; bh=M+Kh61XUw5qSuJ9eydYBrMjcoDbLbGczaAqYsj2uK3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s8Snx0HB2eXzjbLwuYuUKgi3v6D6Qxu8LmFGEOZSibVtCghSIXHaYzxcz6ePhxBkn7APZg8abMnjNfFMkqV6gX6yfcDZBvRcP/atbhbOXGRagkrvyBWxaMERxusy7H9bk+z8mUTfK7qnZvg1C6EDjOp6eiyGhzMKVLxNwGN/kLo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com; spf=pass smtp.mailfrom=cipherat.com; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b=YjmPFtvz; arc=none smtp.client-ip=91.98.42.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cipherat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b="YjmPFtvz" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 9220F84FCA; Sat, 9 May 2026 01:27:42 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1778279262; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=6MzwDyMCw+yTZnEHoNY6HNZh+Y9BdZNnBKLOBVGuZaU=; b=YjmPFtvz1zT47z4y01kCdyk0zcloHJ0pee4MNySGTt3AGO6R3dY+Kxy4OdvQXpHEfOlIQo Y3g//q03ani9lGuhwkSdcAWgAN3z9JsAaSkrLLwFr/U0/lzo6V7/zw5K/pzJiHaFLOJBG6 wY1B+Wa2p9EaMtaEYpIps17orE5ZjE5CHo/pRtJNYr2ldNH8NjZ5llaqODszJaxwuJdbrw y9vn99IvWHCcIRWAonSwYe2RZCcB4RuOSzBDOvySOug99CLUv5npDXnukKV3IuvWA/gcmy TOcioQlYYIDps6YhLjpEDFZ3di0iV3f3BE9wsg52nwo1xC4O0ybJrDiW6XqTz76YuJcy5Q OEv+f8V5Qb4kEXJUmpAyxCSiAf1Zoti8iyXhCZQ8cTUND4ja0ablGEMX7m+k90USYQRC7v ty3AeVgc62tRuK8Y1UloyHumeVd/jQxjapnnIilvwqY/VoqM+M2LAtBRHk2WHU7a9lj+5x GXALK70f6+ior60VZQb/zXvywJUg/1ibU3xsSZwVczDjkrP2yIzk2+TTVA6NaZoWnWklnI opPnaDgfntzOr1dlzDexlZsfQyDkhyeNDlcGCGBPf1fvygMSPDm4V61BXhmLXg2bYfc5Qc MbH/XraIQJbPEdvtfy9Tf2t8RvOzidCfutbFCNDBbXLa0zLCeANek= From: Salman Alghamdi To: gregkh@linuxfoundation.org Cc: straube.linux@gmail.com, error27@gmail.com, luka.gejak@linux.dev, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v7 6/7] staging: rtl8723bs: rtw_mlme: consolidate capability comparisons lines Date: Sat, 9 May 2026 01:27:02 +0300 Message-ID: <20260508222725.24075-7-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260508222725.24075-1-me@cipherat.com> References: <20260508222725.24075-1-me@cipherat.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 X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" Place capability comparisons on single lines. Signed-off-by: Salman Alghamdi --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 233675f3a045..be8b50e8a232 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -367,10 +367,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct = wlan_bssid_ex *dst, u8 fea return (src->ssid.ssid_length =3D=3D dst->ssid.ssid_length) && ((!memcmp(src->mac_address, dst->mac_address, ETH_ALEN))) && ((!memcmp(src->ssid.ssid, dst->ssid.ssid, src->ssid.ssid_length))) && - ((s_cap & WLAN_CAPABILITY_IBSS) =3D=3D - (d_cap & WLAN_CAPABILITY_IBSS)) && - ((s_cap & WLAN_CAPABILITY_ESS) =3D=3D - (d_cap & WLAN_CAPABILITY_ESS)); + ((s_cap & WLAN_CAPABILITY_IBSS) =3D=3D (d_cap & WLAN_CAPABILITY_IBSS)) = && + ((s_cap & WLAN_CAPABILITY_ESS) =3D=3D (d_cap & WLAN_CAPABILITY_ESS)); } =20 struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue, --=20 2.54.0 From nobody Sat Jun 13 07:45:37 2026 Received: from mail.cipherat.com (mail.cipherat.com [91.98.42.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B51239B969 for ; Fri, 8 May 2026 22:27:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.98.42.103 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279268; cv=none; b=EfC9uzL/iUD3abpy4V6rrXHYOqdU39wxhF8+nM6AWH6zWJdlGGyfZ/EfDyxk5ezzcDEULeSnP6R4XJJyaXeopr0AXCf8Ndu654y9Ryn1gLbYH5ux5Yc+nVgU1wHZOlieMD7gInlDfdi4MXVcxN+tMkQt8WeKlO03to7gh+/tckw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778279268; c=relaxed/simple; bh=3VjogJRvlVNg3t8adN5DZTXgCr4LrHLIkitkB/fmWkc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d5a2CDbs8wlKvyhGdC5gDQ1+gL/yQLgjzKTHWY5Kq/vYBKIvxGxP0/KQIwLw5Hx75guxMSpBlPgB7y8zgtawk18UIXTcAudz/3sNCnfE2kehZuefiuphsDvPqAtrypoqZ6zAukkLz5RsnapLWEAq6GUBq/X7oGalLqBpmQpWUNg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com; spf=pass smtp.mailfrom=cipherat.com; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b=oVPOsZkK; arc=none smtp.client-ip=91.98.42.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cipherat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cipherat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=cipherat.com header.i=@cipherat.com header.b="oVPOsZkK" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 8255084FCD; Sat, 9 May 2026 01:27:44 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1778279264; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=d9Ed+ndE0rLiuYa70jJCdm2waF2bxaiVchc8o7SFhK8=; b=oVPOsZkK3nEOkYhPNorJdjnF6qrY9RXqRjG8vqNWjxivcM7hbFbUfiCWYugZX4ViX91PnZ Uu/xZ/FjBcyJ5tz9il/Qfu043AV9jU5CTfAX1CR6zfes18WsmYN6yqXjmKd+9Q68QJSLd0 j/8y0CfxQKYjrS8aYv85NPxBc3KlD3TvkCZWrx06CEx7ZHGshPqHSHqjjh7Zj/lMx3tb22 u30RNGlY+EM3R/51G7dnWX2Q5eR5yhYm8UhCiUFF6AGT6ZMRHwEi/0HbfFEM9Pp4I1iOUk M+uc5a1H3hO6L3ZU50qk7RHwxBZtafDagkylJxH8o6EkIx0JYm08BPhYXgBhbPe03HdS7o GhdNh2PcADCoi87XaEpDtR0SrPhw2ctfZuViWJGFre6uWQjiLHZekNW4oP0Zr4Vp3Ztsdx jXtV6UyYxzLztKw5ACfHjcHnsUywOlxL51mRzCnVq1iimy8oJkcVb4Ni7+f+NPtOmU6C9L YK/CF13Vi3upTZmoshecUpnLGroiHGyoq1fqZYh6jHXgYJ26Oet/GgvaUMBxx6rGyP+ylP V7CsNec49h7kTsTJ3hiMLzhGwjwKAB6FkRmpSMCsiZX2F/vsAgZxVWaXGPiOLWrJiKD+NW 9fnXiGSdR9+v0a0DPaaMBOg2KLiZs50XHEKpc5+Arp//nhnz6HgJQ= From: Salman Alghamdi To: gregkh@linuxfoundation.org Cc: straube.linux@gmail.com, error27@gmail.com, luka.gejak@linux.dev, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v7 7/7] staging: rtl8723bs: rtw_mlme: add blank line for readability Date: Sat, 9 May 2026 01:27:03 +0300 Message-ID: <20260508222725.24075-8-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260508222725.24075-1-me@cipherat.com> References: <20260508222725.24075-1-me@cipherat.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 X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" Add a blank line between the WIFI_UNDER_WPS block and the wifi_spec block to improve readability. Signed-off-by: Salman Alghamdi --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index be8b50e8a232..0104829ca50a 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -626,6 +626,7 @@ static bool rtw_is_desired_network(struct adapter *adap= ter, struct wlan_network else return false; } + if (adapter->registrypriv.wifi_spec =3D=3D 1) { /* for correct flow of 8= 021X to do.... */ u8 *p =3D NULL; uint ie_len =3D 0; --=20 2.54.0