From nobody Fri Jun 12 15:57:17 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 18A0A36F8EB for ; Wed, 13 May 2026 20:36:19 +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=1778704582; cv=none; b=dZAK+aSpRGyv43fgz6gX0C7GZlNGxt5wMSj0l1ZiaUV0ecMysm+amd4ENH7TTGQbOooVxjhHyU8LMf1M+XMN2uu/jKpfTBkoS6x3k1jiCWYP258E9fUZLOkc5684LyrAYh6I7DeUsrM4o05KiQaJk939CL12ujsdKmoX9Ejm3i4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778704582; c=relaxed/simple; bh=wv1wAz5G5jTk9iKfTQXieVLbuRkIyBCE8b6i9HhVL3g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EdyUB5NGfKrYlIlmM3yfWjJO99/y5Y0O3Ju7J28+MEG0xd6JzmLXNkV25t3mCQPprHrmYHhuv8tsMIdkKK2mycv4GwO7Gh0/fPsaRa8vDofBKUXwvcDPP3UWlkiiGepChfTh0rC285bwDghP7TwCt2vRMahsi0MlCfiZ0nuWR2g= 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=MWvmCzGW; 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="MWvmCzGW" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id D6F4984FF2; Wed, 13 May 2026 23:36:17 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1778704578; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=Ys2ruBN+FMlbNaJuod+QMjGTvoSg6mzg3rPSjZ68TBE=; b=MWvmCzGWCi+Bk9wpQi0syWPOqkpRT/+n+WuwwPvhDl6jSZ3ys2ZO2OVeglDLrEmajDKp9p aXwimcd7ExLYzCjCD58EIugkv/ZL06DemneIV7Q4DLC+nH1i+BTIcTc+9W5i7JusaPTvOK NUA4wNuvmIvmCjjQKQ5we9ACZ/E/fu2mkavFLD6rCNOXIOcnoqJVyZOH+gQS4kOLOebvrb F+rZeI8ROvtfSO+98q+SplKcRs6nvpCKsoEMxfettwIq2fPWDTOv9kIz2soQo41DZ1U0kD kgJBTlsBQR47Y0uqBhCkqaLFokOoQ3to9rlXry+zTBzN1O1BlwZRGNPnI7VrRFqkKa3Bv+ adwm3lxNjj0ZQwi0qCmXUcsk60lH4Qq6eFfDYg/IzMKy4JJ0TeeIWypu52rCVbgJjV2Fhh Fa9m/uhUW/h174HxNa4S1y48gAvM7Qc2hWts2OmObd5ddcWz9Iimjlmp3PQT+2e9fuC+8/ AM0MuZeDmBRCdtWt/vtE4DgVfS6nzjAR+2bOePE3vaZZ7r0TU8jdnfYCvWr2RPsP+wiCLw 9XBxTq0pCkj5BAWn6c7UaFgOkuuGn7E1kFGp0k1KEsGjS8hXVNqW72NdzcKrwWm6iZkjTX /mHFT3uE4y/k2Ok6P1Eh0C5QjURfgDv3DGLQW7Dh1OLoBaRnO4m5I= 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 v8 1/6] staging: rtl8723bs: rtw_mlme: wrap lines exceeding 100 columns Date: Wed, 13 May 2026 23:34:59 +0300 Message-ID: <20260513203611.31872-2-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260513203611.31872-1-me@cipherat.com> References: <20260513203611.31872-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 Fri Jun 12 15:57:17 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 C9E3D346A13 for ; Wed, 13 May 2026 20:36:21 +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=1778704583; cv=none; b=qBIq8NBK4ZgLpHzWSxOHwwmwsi98OfjTBQT4BtSTiDAeYnHDBPoMS8m6aXnxTIbwRMAtrBoFRA+RFw0ypxatKx5f8yOm+XzqyklO+aPA+JqjUSLpDHkCMPtr5vVu68CxJSaTIHY59FiHZw6FgqhY1XuQm2oxlwnL8vhjpzrDJUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778704583; c=relaxed/simple; bh=9HdIemgfR4VrPqTNiZHWFj+ptqaf+4Vv3NXR+2U51Wk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rmdimpUpZZTiWq7454Kp923zZa49pIKFTnL5JTwwajbSL0qgAvYljMpDmM4OneWKAdLJIlPfaILv1gQ+jZdJV8f9HuGXi6f+OJn0yuHVI7rBDOG21VHBQAnaQK36OOoN4J2I323NM4peurxHhpX7i6LtyAxLZlrj0XnfwM8+A48= 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=zKQswikO; 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="zKQswikO" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id E207A84FF3; Wed, 13 May 2026 23:36:19 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1778704580; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=3j1c5EDJo/k0wJE4iA56/aLTF1LlfKvBBoU57CDpPI0=; b=zKQswikOW0ArA79rzOwCjPZ9eNqNa9pZcvAKq722cLkQ3QLMUwUc/ixJYVNbRFgc2ek0WR bj83r02X9obqFWZLJe1s9FP92UCLf9U9bF+7MIvvr/t/VMK2ZEwxx6b9OqiuikvcTn8CHP oQ1auWfMWY7eZTqD4WBKWykrQ8k3AhQYE4PzKO3R7Ppq4Jk0np3Ob1DHapp8HNmiBegg03 HVfCSvXfyOybyB0pmhO9oDXv5hHXooxC72/CkbQcyP1Qhl92xn9sW0OFJlcSOnnlfovV2g E9VXMluMoo3uo+u5GfE0KBpOU8Otoinh015zxYAQJAtBQ1YyVJooa+MQIPB46L1axWfkat 2KT9gGboWEns0Nrao57ct6FZOuW9nrlT/uvAhEmrJirFRP2KYfISRJpWof1z1z357Lp77U uZeEl0hJByT1b986u09D0zBUtcEXo0aPlJq9DMJpKfmYU3TN0+twAWR0nEaTOLkXTfgEBu zdUJkltiqbpxxZDidt5z2dq8gaG0a6anUWy6Bn7em0+42ckSkIlphOCcMsfCMK0CCwa6tb o7eTJZEv4Bdr1KA477PekKSMLitbShKAZHrhdz9+CDHNuRwI4CkrV4KkBlAACrK5s4zX0k /6gDsx2vI1P7Fgg13VB1MGPxPCrZzN/bfIOQH6Vwwl0nRgDUxDvuQ= 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 v8 2/6] staging: rtl8723bs: rtw_mlme: wrap rtw_sitesurvey_cmd condition Date: Wed, 13 May 2026 23:35:00 +0300 Message-ID: <20260513203611.31872-3-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260513203611.31872-1-me@cipherat.com> References: <20260513203611.31872-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 Fri Jun 12 15:57:17 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 D8C79381AFD for ; Wed, 13 May 2026 20:36:23 +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=1778704585; cv=none; b=ro98pgS1nzW0RuMKTCNYLveZOqYCCz54OcjL2iQxR9+7L/vIVvnLY2uDBDB58n/qPTvGloRxHt0IC9+XptpXgUOQ9JBrhm7IXDxtrH5gtfz6iGp+lvyx6C7z7ktIJnxiZEpvlT+DocMRX8RGV21I4Nq3dES2k1jUKUXvkyy5b2Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778704585; c=relaxed/simple; bh=6trcGTC37H9MXsMGUkJAY7fu3Qy9pHRpk0B1zV+YEQg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fyfQaiYTS7toGeVABkHn3ieAH8gRUeIK3vB3YI7eSkctFgO+ardT0kf+edxXrz2k7jqb15moGziufJ+Nq29RkmNd0Oq5R1ZabFQ4I1DCINa8zBnIoTSuL/MJS/H19F3/+Jwt3ilm9psDfl3vXqWiXLwhL8ncYiiHkEM/SOaH+KU= 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=BpkKSqqK; 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="BpkKSqqK" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id BDD9984FEE; Wed, 13 May 2026 23:36:21 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1778704582; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=iOjXUmX/3LFVvlDQgBU1jNZBrZ14fTBb4/kiLAqbpb0=; b=BpkKSqqKLBsXUP7MsfaFQa0P5qGx2f8xC7/BOspfowk4alv5NMYxFTRH8qv9cXvTNi0Pu1 b0xgWWiBLFFNFusm2PjRi8/LNkCKSBbiVjH87oe7MKCPX0HwPOKTwr8vEOYfxAswa/EkTC DcsrBCVfSrpJ2H92ciyxcQMKQkQ/w33zTgb5aWxrQRoKHFfoe10WojEnTWCUS0z4ODDo4I xoS+WG+nFWuZLtTRY15VRN+09mfxq7bISUGc/YKp2DgGtVS2QJhF6Uuni/pboDke1ivF7I /J1xCHGB1v3wEjr4v9gp6N4JfuxsJYb8AzbFbNDMK4VPs+sd4DRcOqI8pcFroM9KcrKjFi huayaGeV6AwHF/AUum1dRMf/LPhAY7N4Cti2saaV6DCrFt6jAiUs1JzDf/vxTcjOWG8jXG Xwqvr5JzxuXnSLEe21Lw+1jaVj4gP/CE8lq6j611Y0vjIl3yfID14FMv1HhsHl99p4Gfxl AJtrsEBem+g3bNuO4qz5URk5e1gcGGuwVLcyBP80oEbBhCPk3sweTSgemQhCzoyVMqIkCc 5crMNEGdjOgKnBb4DsZxJXncilo+xprFsPIx6AObtiLUOG1vMoyu2/tiir0Db+8PA5vQbC 1yk/uzK2T7CXIiV/AkilmmJ2ijeHWAUjV06MTfNsSlpxckrYxrWps= 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 v8 3/6] staging: rtl8723bs: rtw_mlme: extract local variables for long expressions Date: Wed, 13 May 2026 23:35:01 +0300 Message-ID: <20260513203611.31872-4-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260513203611.31872-1-me@cipherat.com> References: <20260513203611.31872-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 Fri Jun 12 15:57:17 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 4AEE8384CD7 for ; Wed, 13 May 2026 20:36:25 +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=1778704587; cv=none; b=WeldYsgiM6rMuiFxvl/iM8A5rsOYpCpB+Gb/0dieRcu02akifeb6IvfKfy3UKqGG1EWXUrAEIPS4AHTrZ0QxuO2pUxlp3wU3CApaNPS2nfTvYEp/FBXLsukE22r4C5fJMGjzWLwAqbXwqaHFR7DnZd0dnTviDKh+wpXCZkSZMNs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778704587; c=relaxed/simple; bh=aIV2EFGl8Rw3+pTqWtdl1K7zxN/9Zupq79LHIy59AHY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XcwJ2zSCE41p6en7wMzsgFCo/vbSAWooT3BLU9efIv6fXafweXgXfYBoV2KuM/BeHy0J9NR9naS4X7D6LpXn9jqZnI1DjXUNn+/ARdgL/9AwIw6zUVxLd+fZ8idej8+gAONkCx6Buj0YeeED2BJ+zQZ39My8IrOdSq+jd1Yef7c= 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=CCRzeldb; 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="CCRzeldb" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 887B984FF0; Wed, 13 May 2026 23:36:23 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1778704583; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=5nwBJM09V8VDtqet+QMNYG2G81ccmqT9GY2u6fEOuaM=; b=CCRzeldbL0PXzMHaGcBPDOSR5bD+MG0jkzi6yZ6qnCbS5yktnnK/HC4Ab1dDZoNfw1bpdg SGusSgk6zGwW6Kgl+aW32JxrFmDiyrXvcNXJLiqMAPkhU/b2tNL6w5ExQPOAApFco7aBZd mMP5WVNXBD/pauIP9+kqBMlo/vTvdM0c6eI22HHGfG1tkCr6XyEspEtr/61rREZDpZhpix nFrUQZ8b1JiEthGd5IGarHE4KXJfaFzNsYa/9AqACgCg6d5Y1cE+2PZX4ZndrFn/RpJ/c0 GKfzl88rm4sjeC4My7VR73UoFpGdXb9Jz+zq7H2pkoIuy8LQpa0iRKDgSFWmG/KrkvH+Su U5baGxo4j1wxWmgHleekZjc/EiZ3p9HM1qyzZ1WZGVoCVvKeo0ALZulfeTxdaLLTn4YM6c Y/ic45q6mXL++DHlWK6Qkb6RIccPVb+odzHBAql32OPOe98oThtPXAf7kL8tcatqWOVdjj DUPdIjCF4kf0McRAgOWUAqKa1qJtcm9yPPwjTJR4xpK9Ak8QC5rgB0MJa+G66q7TjDyLM/ Yw2mDMGU0JD6fb1GUyP/+Y4uWs3jv5Pq7sAWQvxLUbVextTUOaUQci+A7ZUYvczU9Q9QEl F9mZ6hkUPfEv35PtnH/cplziDw7y97x/8IWNjW5ADowGdbm6DbGeo= 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 v8 4/6] staging: rtl8723bs: rtw_mlme: remove dead commented-out code Date: Wed, 13 May 2026 23:35:02 +0300 Message-ID: <20260513203611.31872-5-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260513203611.31872-1-me@cipherat.com> References: <20260513203611.31872-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 Fri Jun 12 15:57:17 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 93CA8360EED for ; Wed, 13 May 2026 20:36:27 +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=1778704589; cv=none; b=IrH/kfbMV2h5kUy8Z2s9m9C3/5lR4p80I5rKfnnI3lf57YsptQ7IVOyuUgf4+GEgJpgTDHQORqnfkEVq/N5k4zqKcM2NeQp0AF3jqK0sffXK8o5rQklFvpQGQaYsAwVTocwCQ7Kymbhvoa3Nwt8jxkF8fnJz7I9j+4av9WAZs/c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778704589; c=relaxed/simple; bh=M+Kh61XUw5qSuJ9eydYBrMjcoDbLbGczaAqYsj2uK3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oIDOCJNv8X2rExg3RrszYWW08oQvpKpZA2eAwOXSAugr1QNhb/mEAYC872EyJher2czpdmQt+sU4+6dTEbqFPumdACKeb8Nif2WcvnR5l0iKgDKZxQU0xs8AO6DYP9k42RRZPaZu2d6cSLiAIu6r5oe5HE87ync3XPE/8M6AmrE= 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=g3TGDkN6; 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="g3TGDkN6" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 3733984FF2; Wed, 13 May 2026 23:36:25 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1778704585; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=6MzwDyMCw+yTZnEHoNY6HNZh+Y9BdZNnBKLOBVGuZaU=; b=g3TGDkN6FVbZOCC/GqFHVFepmHtyEExbuYoODMFyGBhyyhX426BAXtskuWuagHY624H61q /gWcPJ/Bg8/WClyLsevbUhnCJxN+Z+j6rCR9jVXePAGlsmKLpO7izaym3mgS/kDW0g19vo I/D+MJCdNHXYKU/XUyeyy/m4RQySwv4Ap5U2Ja+Jxoc7As3szroiDPepz8jCrkKdVY013H 13PQJLr2XU7reXpnT31dmH4iXdUxIBQcQAPTLI///PXP+dhiOJfnT4wSXHCC+FTBJxRGqX 3TaT/taJuPLG1K0Dv9gzxX1s6X6OxK/ABhjoOG6aErnVkGzABKxinKqm91gDu6v6ULQXeb p+9ZdS6npMUoU7NEEymdnG0h+GEszWxrg7URci8bGhnYn6c2U6lNTvuoQ5gFudNtf2np/P LB/eI04cwU0WVEWb2ER+wTCfmZquAfy6i7ChNieJYokDyZ1s68/mhVIlLBvf0idfr1hTpo IkaF/JTxMMdtJ5d1sjwvaK8Rcf4UEF06T+RpWI0EJVjwYBCUJtay3XRbsnb6++TPm/TPh4 P7/m/y2nHAfhlvZUiVXYofbnIJC7+jUkicoEoE2Cz9rRNmrC0bXIuOCrvyiIyOJ8XTQ3eQ YEdRnu7H035npDQoYWhsfS3Sc9Bd56ZSkPJEbvlyGRl+aKtDN3HAA= 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 v8 5/6] staging: rtl8723bs: rtw_mlme: consolidate capability comparisons lines Date: Wed, 13 May 2026 23:35:03 +0300 Message-ID: <20260513203611.31872-6-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260513203611.31872-1-me@cipherat.com> References: <20260513203611.31872-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 Fri Jun 12 15:57:17 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 73B563A6F08 for ; Wed, 13 May 2026 20:36:29 +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=1778704592; cv=none; b=vBu+Zr/qhsEU4kbrlCNA0yvYGIZbfe85QfMj/4dhBqSj6DZ1iq8vfEoscN3aQm1YoQtRFKtWQ4TTYJhMajeuF2vEUusjNdoH6kCoTGWOIdjq++9vN0EKp2fDidAPRWGB4V9xazz3fs/00V0KZDh9rDDhx4f06vE4J3HYBnqCegw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778704592; c=relaxed/simple; bh=3VjogJRvlVNg3t8adN5DZTXgCr4LrHLIkitkB/fmWkc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mDjqE0PhCQuu7L2+SlcD8FnL7N/M2xFAnAKFmIGzK2G58C82Wwi1mviChvbcsWuYTOX2QtaI0WHp0FSNryySjH90tVU0LWc1fTUg/OAPjRBhmZ90GUGepVl2ZpZVk0V20YhHxyizF925/jnaSqoy++PojU2SSruazd3Bl1BW6hw= 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=tuBoX9bJ; 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="tuBoX9bJ" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 03AFB84FF3; Wed, 13 May 2026 23:36:26 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1778704587; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=d9Ed+ndE0rLiuYa70jJCdm2waF2bxaiVchc8o7SFhK8=; b=tuBoX9bJNgrv5tS3LlDcZZwILPGoXK6QpZNhnvJKeKRfh+2Z5RZ6E7WV6V3BETlFdqugsM EPM1Zc5OPoJxCx8LXSjaBtdX+IvlI75ILCfscWZ1IGj8Z6AjcG+qPxI5FT5bT780tZyeip 8cl1Woi5tMAk2vHi7xCK6bcQdA/j00oMWZpe+cktMV9naCa4oUflGbo+xgPDqNxL9bOkFd hSpA2DEmcLqh2d0xqQMWzcriNaU/UUqBQaT0iuQGybqiIudE2V6X8RPH1ZMnBcLKn7eUz5 BujudJk5Rjy65PMMWNvQU+Rr8tdJyRaFPAM9Q/o5Alu6nzisTNKJfAUoAXa5KCy/DqZYtm kwlllY+LBrY5F85w8jKx4VtS7cNmgbZ2WOsuk262goyyZ0Wg/MLb/rGLtz5R4+XPcAYyrX NsU/8/A9/+8kSCiHjVmc0XGZyDZvWKoXViuNfUPq1omhj44oflJLiyYy0YxqDJMyZaXiUE WEC6NOJ7Ge4xA9Yfy+GUl4nnk+IyWQ+V7tHZNnedlADv2eISyN8WbxTbNe6XQlXLKMBXLd HUjRkXVYg2RKexrt7jNEbXwSTQejlVCDjHoMliB/uzl0WQAKq+HApkW2okf/j2LfxNeZXy nfGtPFiNNKxuxLbsGpdJaOlCWd4neKaDK+2f6CV3bsSIhYScQDkuY= 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 v8 6/6] staging: rtl8723bs: rtw_mlme: add blank line for readability Date: Wed, 13 May 2026 23:35:04 +0300 Message-ID: <20260513203611.31872-7-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260513203611.31872-1-me@cipherat.com> References: <20260513203611.31872-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