staging: rtl8723bs: rtw_mlme: fix line length warnings

Fix lines exceeding 100 columns in rtw_mlme.c as flagged by checkpatch.pl. Extract local variables to avoid breaking arithmetic operations, structure member accesses, and comparison operators across lines. Fix function signature alignment to match the column of the first parameter. Use min_t() for value capping. Fix block comment formatting on continuation lines. Remove dead commented-out code found while fixing line lengths.

Signed-off-by Salman Alghamdi <[email protected]>

---
v2:
- Extract local variables instead of breaking arithmetic across lines
- Extract local variables for long struct member access paths
- Fix function signature alignment to match first parameter column
- Use min_t() instead of ternary for wrqu.data.length cap
- Fix block comment alignment on continuation lines
- Add blank lines after variable declarations
- Remove dead commented-out code

---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 277 +++++++++++++++-------
 1 file changed, 189 insertions(+), 88 deletions(-)

drivers/staging/rtl8723bs/core/rtw_mlme.c +6 -2

index ddfc56f0253d..045c636142f9 100644
@@ -52,7 +52,10 @@ int	rtw_init_mlme_priv(struct adapter *padapter)
 	pmlmepriv->pscanned = NULL;
 	pmlmepriv->fw_state = WIFI_STATION_STATE; /*  Must sync with rtw_wdev_alloc() */
 	pmlmepriv->cur_network.network.infrastructure_mode = Ndis802_11AutoUnknown;
-	pmlmepriv->scan_mode = SCAN_ACTIVE;/*  1: active, 0: passive. Maybe someday 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 = SCAN_ACTIVE;
 
 	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 *pmlmepriv)
 	rtw_free_mlme_ie_data(&pmlmepriv->p2p_beacon_ie, &pmlmepriv->p2p_beacon_ie_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_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_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);
 }
 

drivers/staging/rtl8723bs/core/rtw_mlme.c +9 -4

 {
 	struct list_head *phead, *plist;
 	struct wlan_network *found = NULL;

@@ -420,7 +423,8 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
 	long rssi_final;
 
 	/* The rule below is 1/5 for sample value, 4/5 for history value */
-	if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) && is_same_network(&padapter->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 = padapter->recvpriv.signal_strength;
 		sq_final = padapter->recvpriv.signal_qual;

@@ -431,11 +435,15 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
 			rssi_final = rssi_ori;
 	} else {
 		if (sq_smp != 101) { /* from the right channel */
-			ss_final = ((u32)(src->phy_info.signal_strength) + (u32)(dst->phy_info.signal_strength) * 4) / 5;
-			sq_final = ((u32)(src->phy_info.signal_quality) + (u32)(dst->phy_info.signal_quality) * 4) / 5;
+			ss_final = ((u32)(src->phy_info.signal_strength) +
+				    (u32)(dst->phy_info.signal_strength) * 4) / 5;
+			sq_final = ((u32)(src->phy_info.signal_quality) +
+				    (u32)(dst->phy_info.signal_quality) * 4) / 5;
 			rssi_final = (src->rssi + dst->rssi * 4) / 5;
 		} else {
-			/* bss info not receiving from the right channel, use the original RX signal infos */
+			/* bss info not receiving from the right channel,
+			 * use the original RX signal infos
+			 */
 			ss_final = dst->phy_info.signal_strength;
 			sq_final = dst->phy_info.signal_quality;
 			rssi_final = dst->rssi;

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -2

-		rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + sizeof(struct ndis_802_11_fix_ie),
-								pmlmepriv->cur_network.network.ie_length);
+		rtw_update_protection(adapter, ie, pmlmepriv->cur_network.network.ie_length);
 	}
 }
 

drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -0

+
+			p = rtw_get_ie(ie_ptr, WLAN_EID_RSN, &ie_len, ie_len_val);
 			if (p && ie_len > 0)
 				bselected = true;
 			else

drivers/staging/rtl8723bs/core/rtw_mlme.c +6 -3

+
 	if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
-		if (pnetwork->network.infrastructure_mode != pmlmepriv->cur_network.network.infrastructure_mode)
+		if (inf_mode != cur_inf)
 			bselected = false;
 	}
 

@@ -654,12 +677,14 @@ void rtw_survey_event_callback(struct adapter	*adapter, u8 *pbuf)
 
 	/*  update IBSS_network 's timestamp */
 	if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
-		if (!memcmp(&pmlmepriv->cur_network.network.mac_address, pnetwork->mac_address, ETH_ALEN)) {
+		if (!memcmp(&pmlmepriv->cur_network.network.mac_address,
+			    pnetwork->mac_address, ETH_ALEN)) {
 			struct wlan_network *ibss_wlan = NULL;
 
 			memcpy(pmlmepriv->cur_network.network.ies, pnetwork->ies, 8);
 			spin_lock_bh(&pmlmepriv->scanned_queue.lock);
-			ibss_wlan = rtw_find_network(&pmlmepriv->scanned_queue,  pnetwork->mac_address);
+			ibss_wlan = 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);

@@ -710,13 +735,15 @@ void rtw_surveydone_event_callback(struct adapter	*adapter, u8 *pbuf)
 					_set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);

drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -1

-					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));
 
 					rtw_update_registrypriv_dev_network(adapter);
 					rtw_generate_random_ibss(pibss);

@@ -743,9 +770,12 @@ void rtw_surveydone_event_callback(struct adapter	*adapter, u8 *pbuf)
 				rtw_indicate_connect(adapter);
 			} else {

drivers/staging/rtl8723bs/core/rtw_mlme.c +5 -4

+
 		if (rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) {
-			if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
-				&& check_fwstate(pmlmepriv, _FW_LINKED)) {
+			if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) &&
+			    check_fwstate(pmlmepriv, _FW_LINKED)) {
 				if (rtw_select_roaming_candidate(pmlmepriv) == _SUCCESS) {
-					receive_disconnect(adapter, pmlmepriv->cur_network.network.mac_address
-						, WLAN_REASON_ACTIVE_ROAM);
+					receive_disconnect(adapter, mac_addr,
+							   WLAN_REASON_ACTIVE_ROAM);
 				}
 			}
 		}

drivers/staging/rtl8723bs/core/rtw_mlme.c +5 -2

 {
 	int i;
 	struct sta_info *bmc_sta, *psta = NULL;

@@ -1005,7 +1038,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
 		}
 
 		/* for A-MPDU Rx reordering buffer control for bmc_sta & sta_info */
-		/* if A-MPDU Rx is enabled, resetting  rx_ordering_ctrl wstart_b(indicate_seq) to default value = 0xffff */
+		/* if A-MPDU Rx is enabled, resetting rx_ordering_ctrl
+		 * wstart_b(indicate_seq) to default value = 0xffff
+		 */
 		/* todo: check if AP can send A-MPDU packets */
 		for (i = 0; i < 16 ; i++) {
 			preorder_ctrl = &psta->recvreorder_ctrl[i];

@@ -1022,7 +1057,8 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
 				preorder_ctrl->enable = false;
 				preorder_ctrl->indicate_seq = 0xffff;
 				preorder_ctrl->wend_b = 0xffff;
-				preorder_ctrl->wsize_b = 64;/* max_ampdu_sz;ex. 32(kbytes) -> wsize_b =32 */
+				/* max_ampdu_sz;ex. 32(kbytes) -> wsize_b =32 */
+				preorder_ctrl->wsize_b = 64;
 			}
 		}
 	}

drivers/staging/rtl8723bs/core/rtw_mlme.c +4 -2

 	padapter->recvpriv.signal_qual = 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 = translate_percentage_to_dbm(ptarget_wlan->network.phy_info.signal_strength);
+	/* the ptarget_wlan->network.rssi is raw data, we use
+	 * ptarget_wlan->network.phy_info.signal_strength instead (has scaled)
+	 */
+	padapter->recvpriv.rssi = translate_percentage_to_dbm(signal_strength);
 
 	rtw_set_signal_stat_timer(&padapter->recvpriv);
 

drivers/staging/rtl8723bs/core/rtw_mlme.c +24 -8

+
+	rtw_update_ht_cap(padapter, cur_network->network.ies,
+			  cur_network->network.ie_length,
+			  (u8)cur_network->network.configuration.ds_config);
 }
 
 static struct rt_pmkid_list   backupPMKIDList[NUM_PMKID_CACHE];

@@ -1095,9 +1139,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 with AP for 60 seconds. */
+		/*  When the countermeasure is trigger, the driver have to disconnect
+		 *  with AP for 60 seconds.
+		 */
 
-		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 = adapter->securitypriv.PMKIDIndex;
 		backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure;
 		backupTKIPcountermeasure_time = adapter->securitypriv.btkip_countermeasure_time;

@@ -1108,8 +1155,11 @@ void rtw_reset_securitypriv(struct adapter *adapter)
 		memset((unsigned char *)&adapter->securitypriv, 0, sizeof(struct security_priv));
 
 		/*  Added by Albert 2009/02/18 */
-		/*  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);
+		/*  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 = backupPMKIDIndex;
 		adapter->securitypriv.btkip_countermeasure = backupTKIPCountermeasure;
 		adapter->securitypriv.btkip_countermeasure_time = backupTKIPcountermeasure_time;

@@ -1141,10 +1191,14 @@ void rtw_reset_securitypriv(struct adapter *adapter)
 /* Notes: the function could be > passive_level (the same context as Rx tasklet) */
 /* pnetwork : returns from rtw_joinbss_event_callback */
 /* ptarget_wlan: found from scanned_queue */
-/* if join_res > 0, for (fw_state ==WIFI_STATION_STATE), we check if  "ptarget_sta" & "ptarget_wlan" exist. */
+/* if join_res > 0, for (fw_state ==WIFI_STATION_STATE), we check
+ * if "ptarget_sta" & "ptarget_wlan" exist.
+ */
 /* if join_res > 0, for (fw_state ==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist. */
-/* if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan != NULL). */
-/*  */
+/* if join_res > 0, update "cur_network->network" from "pnetwork->network"
+ * if (ptarget_wlan != NULL).
+ */
+
 void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
 {
 	struct sta_info *ptarget_sta = NULL, *pcur_sta = NULL;

@@ -1154,8 +1208,10 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
 	struct wlan_network	*cur_network = &pmlmepriv->cur_network;
 	struct wlan_network	*pcur_wlan = NULL, *ptarget_wlan = NULL;
 	unsigned int		the_same_macaddr = false;
+	struct __queue *scanned_queue = &pmlmepriv->scanned_queue;
 
-	the_same_macaddr = !memcmp(pnetwork->network.mac_address, cur_network->network.mac_address, ETH_ALEN);
+	the_same_macaddr = !memcmp(pnetwork->network.mac_address,
+				   cur_network->network.mac_address, ETH_ALEN);
 
 	pnetwork->network.length = get_wlan_bssid_ex_sz(&pnetwork->network);
 	if (pnetwork->network.length > sizeof(struct wlan_bssid_ex))

drivers/staging/rtl8723bs/core/rtw_mlme.c +13 -5

 			if (pcur_wlan)
 				pcur_wlan->fixed = false;
 

@@ -1205,7 +1263,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
 			if (pcur_sta)
 				rtw_free_stainfo(adapter, pcur_sta);
 
-			ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.mac_address);
+			ptarget_wlan = rtw_find_network(scanned_queue,
+							pnetwork->network.mac_address);
 			if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
 				if (ptarget_wlan)
 					ptarget_wlan->fixed = true;

@@ -1230,7 +1289,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
 
 	rtw_joinbss_update_network(adapter, ptarget_wlan, pnetwork);
 
-	/* s3. find ptarget_sta & update ptarget_sta after update cur_network only 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 = rtw_joinbss_update_stainfo(adapter, pnetwork);
 		if (!ptarget_sta) {

@@ -1298,7 +1359,8 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
 			/* report to upper layer */
 			spin_lock_bh(&psta->lock);
 			if (psta->passoc_req && psta->assoc_req_len > 0) {
-				passoc_req = kmemdup(psta->passoc_req, psta->assoc_req_len, GFP_ATOMIC);
+				passoc_req = kmemdup(psta->passoc_req,
+						     psta->assoc_req_len, GFP_ATOMIC);
 				if (passoc_req) {
 					assoc_req_len = psta->assoc_req_len;
 

@@ -1310,7 +1372,8 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
 			spin_unlock_bh(&psta->lock);
 
 			if (passoc_req && assoc_req_len > 0) {
-				rtw_cfg80211_indicate_sta_assoc(adapter, passoc_req, assoc_req_len);
+				rtw_cfg80211_indicate_sta_assoc(adapter,
+								passoc_req, assoc_req_len);
 
 				kfree(passoc_req);
 			}

@@ -1323,7 +1386,10 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
 	if (psta) {
 		/* the sta have been in sta_info_queue => do nothing */
 
-		return; /* between drv has received this event before and  fw have not yet 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;
 	}
 
 	psta = rtw_alloc_stainfo(&adapter->stapriv, pstassoc->macaddr);

drivers/staging/rtl8723bs/core/rtw_mlme.c +20 -10

@@ -1407,16 +1475,19 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
 
 		if (adapter->registrypriv.wifi_spec == 1) {
 			roam = false;
-		} else if (reason == WLAN_REASON_EXPIRATION_CHK && rtw_chk_roam_flags(adapter, RTW_ROAM_ON_EXPIRED)) {
+		} else if (reason == WLAN_REASON_EXPIRATION_CHK &&
+			   rtw_chk_roam_flags(adapter, RTW_ROAM_ON_EXPIRED)) {
 			roam = true;
-		} else if (reason == WLAN_REASON_ACTIVE_ROAM && rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) {
+		} else if (reason == WLAN_REASON_ACTIVE_ROAM &&
+			   rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) {
 			roam = true;
 			roam_target = pmlmepriv->roam_network;
 		}
 
 		if (roam) {
 			if (rtw_to_roam(adapter) > 0)
-				rtw_dec_to_roam(adapter); /* this stadel_event is caused by roaming, decrease to_roam */
+				/* this stadel_event is caused by roaming, decrease to_roam */
+				rtw_dec_to_roam(adapter);
 			else if (rtw_to_roam(adapter) == 0)
 				rtw_set_to_roam(adapter, adapter->registrypriv.max_roaming_times);
 		} else {

@@ -1430,7 +1501,8 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
 
 		spin_lock_bh(&pmlmepriv->scanned_queue.lock);
 		/*  remove the network entry in scanned_queue */
-		pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.mac_address);
+		pwlan = rtw_find_network(&pmlmepriv->scanned_queue,
+					 tgt_network->network.mac_address);
 		if (pwlan) {
 			pwlan->fixed = false;
 			rtw_free_network_nolock(adapter, pwlan);

@@ -1444,12 +1516,14 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
 	      check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
 		rtw_free_stainfo(adapter,  psta);
 
-		if (adapter->stapriv.asoc_sta_count == 1) {/* a sta + bc/mc_stainfo (not Ibss_stainfo) */
+		/* a sta + bc/mc_stainfo (not Ibss_stainfo) */
+		if (adapter->stapriv.asoc_sta_count == 1) {
 			u8 ret = _SUCCESS;
 
 			spin_lock_bh(&pmlmepriv->scanned_queue.lock);
 			/* free old ibss network */
-			pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.mac_address);
+			pwlan = rtw_find_network(&pmlmepriv->scanned_queue,
+						 tgt_network->network.mac_address);
 			if (pwlan) {
 				pwlan->fixed = false;
 				rtw_free_network_nolock(adapter, pwlan);

@@ -1459,9 +1533,11 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
 			pdev_network = &adapter->registrypriv.dev_network;
 			pibss = adapter->registrypriv.dev_network.mac_address;
 
-			memcpy(pdev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_network->network));
+			memcpy(pdev_network, &tgt_network->network,
+			       get_wlan_bssid_ex_sz(&tgt_network->network));
 
-			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));
 
 			rtw_update_registrypriv_dev_network(adapter);
 

@@ -1530,9 +1606,11 @@ void _rtw_join_timeout_handler(struct timer_list *t)
 
 	} else {
 		rtw_indicate_disconnect(adapter);
-		free_scanqueue(pmlmepriv);/*  */
+		free_scanqueue(pmlmepriv);
 
-		/* indicate disconnect for the case that join_timeout and check_fwstate != FW_LINKED */
+		/* indicate disconnect for the case that join_timeout and
+		 * check_fwstate != FW_LINKED
+		 */
 		rtw_cfg80211_indicate_disconnect(adapter);
 	}
 

drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -1

 			rtw_hal_dm_watchdog_in_lps(adapter);
 		} else {
-			/* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) in traffic_status_watchdog() */
+			/* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) in
+			 * traffic_status_watchdog()
+			 */
 		}
 
 	} else {

drivers/staging/rtl8723bs/core/rtw_mlme.c +8 -3

+
+	if (rssi_diff < mlme->roam_rssi_diff_th)
 		goto exit;
 
 	if (*candidate && (*candidate)->network.rssi >= competitor->network.rssi)

@@ -1757,9 +1839,12 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme
 
 	/* check ssid, if needed */
 	if (mlme->assoc_ssid.ssid[0] && mlme->assoc_ssid.ssid_length) {
-		if (competitor->network.ssid.ssid_length != mlme->assoc_ssid.ssid_length
-			|| memcmp(competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, mlme->assoc_ssid.ssid_length)
-		)
+		u8 *ssid_comp = competitor->network.ssid.ssid;
+		u8 *ssid_mlme = mlme->assoc_ssid.ssid;
+		u32 len_comp = competitor->network.ssid.ssid_length;
+		u32 len_mlme = mlme->assoc_ssid.ssid_length;
+
+		if (len_comp != len_mlme || memcmp(ssid_comp, ssid_mlme, len_mlme))
 			goto exit;
 	}
 

drivers/staging/rtl8723bs/core/rtw_mlme.c +6 -3

 {
 	unsigned	int ielength = 0;
 	unsigned int i, j;

@@ -2055,7 +2143,8 @@ static void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)
 
 		wrqu.data.length = p - buff;
 
-		wrqu.data.length = (wrqu.data.length < IW_CUSTOM_MAX) ? wrqu.data.length : IW_CUSTOM_MAX;
+		wrqu.data.length = min_t(typeof(wrqu.data.length),
+					 wrqu.data.length, IW_CUSTOM_MAX);
 
 		kfree(buff);
 	}

@@ -2085,7 +2174,8 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u
 		ielength += psecuritypriv->wps_ie_len;
 	} else if ((authmode == WLAN_EID_VENDOR_SPECIFIC) || (authmode == WLAN_EID_RSN)) {
 		/* copy RSN or SSN */
-		memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypriv->supplicant_ie[1] + 2);
+		memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0],
+		       psecuritypriv->supplicant_ie[1] + 2);
 		ielength += psecuritypriv->supplicant_ie[1] + 2;
 		rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie);
 	}

@@ -2123,7 +2213,8 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
 	struct	security_priv *psecuritypriv = &adapter->securitypriv;
 	struct	wlan_network	*cur_network = &adapter->mlmepriv.cur_network;
 
-	pdev_network->privacy = (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0) ; /*  adhoc no 802.1x */
+	/* adhoc no 802.1x */
+	pdev_network->privacy = (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0);
 
 	pdev_network->rssi = 0;
 

drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -1

 }
 
 /* the function is at passive_level */

@@ -2172,7 +2263,9 @@ void rtw_joinbss_reset(struct adapter *padapter)
 
 	struct ht_priv *phtpriv = &pmlmepriv->htpriv;
 
-	/* todo: if you want to do something io/reg/hw setting before join_bss, please add code here */
+	/* todo: if you want to do something io/reg/hw setting before join_bss,
+	 * please add code here
+	 */
 
 	pmlmepriv->num_FortyMHzIntolerant = 0;
 

drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -1

 {
 	u32 ielen, out_len;
 	enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor;

@@ -2343,7 +2438,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
 
 	/* update default supported_mcs_set */
 	if (stbc_rx_enable)
-		ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_1R);/* RX STBC One spatial stream */
+		/* RX STBC One spatial stream */
+		ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_1R);
 
 	set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_1R);
 

drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -1

+
+	p = rtw_get_ie(ie_ptr, WLAN_EID_HT_CAPABILITY, &len, ie_remaining);
 	if (p && len > 0) {
 		pht_capie = (struct ieee80211_ht_cap *)(p + 2);
 		max_ampdu_sz = (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR);

@@ -2419,7 +2518,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe
 	}
 
 	len = 0;
-	p = rtw_get_ie(pie + sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_OPERATION, &len, ie_len - sizeof(struct ndis_802_11_fix_ie));
+	p = rtw_get_ie(ie_ptr, WLAN_EID_HT_OPERATION, &len, ie_remaining);
 	if (p && len > 0) {
 		/* todo: */
 	}

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1

 		/* update the MCS set */
 		for (i = 0; i < 16; i++)
-			pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= pmlmeext->default_supported_mcs_set[i];
+			mcs_rate[i] &= pmlmeext->default_supported_mcs_set[i];
 
 		/* update the MCS rates */
 		set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_1R);

glad to see v2, just one thing before inline reviews of the code. You don't have to state what did you do to make lines shorter than 100 characters, because we can read the diff and this commit message is too long for cleanup patch.

drivers/staging/rtl8723bs/core/rtw_mlme.c int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea · line 375

Quoted 5 lines

}

drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -1

-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)

					    ^^^^^

This is still not aligned correctly. Please do it like:
struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue,
struct wlan_network *network)

drivers/staging/rtl8723bs/core/rtw_mlme.c static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex · line 473

Quoted 6 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1

@@ -462,10 +470,12 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex
 		&pmlmepriv->cur_network.network,
 		&pmlmepriv->cur_network.network);
 
-	if (check_fwstate(pmlmepriv, _FW_LINKED) && (is_same_network(&pmlmepriv->cur_network.network, pnetwork, 0))) {
+	u8 *ie = pmlmepriv->cur_network.network.ies + sizeof(struct ndis_802_11_fix_ie);

You should declare u8 *ie inside the if statement to reduce its scope as much as possible and if left this way it will declare it even if condition is false.

drivers/staging/rtl8723bs/core/rtw_mlme.c static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex · line 477

Quoted 4 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -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);

Put u8 *ie ... here, under update_network.

Quoted 10 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -2

-		rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + sizeof(struct ndis_802_11_fix_ie),
-								pmlmepriv->cur_network.network.ie_length);
+		rtw_update_protection(adapter, ie, pmlmepriv->cur_network.network.ie_length);
 	}
 }
 

@@ -600,12 +610,16 @@ static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network
 	desired_encmode = psecuritypriv->ndisencryptstatus;
 	privacy = pnetwork->network.privacy;
 

drivers/staging/rtl8723bs/core/rtw_mlme.c static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network · line 616

Quoted 4 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -0

+	u8 *ie_ptr = pnetwork->network.ies + _FIXED_IE_LENGTH_;
+	u32 ie_len_val = pnetwork->network.ie_length - _FIXED_IE_LENGTH_;
+
 	if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) {

Again you should move two variables declared above here, inside if statement. Additionally, calculating ie_len_val outside the check is risky. You should ensure ie_length is actually greater than _FIXED_IE_LENGTH_ before performing the subtraction to prevent an unsigned underflow/wrap-around.

Quoted 8 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -2

@@ -1072,10 +1113,13 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
 			break;
 	}
 
-	rtw_update_protection(padapter, (cur_network->network.ies) + sizeof(struct ndis_802_11_fix_ie),
-									(cur_network->network.ie_length));
+	u8 *ie = cur_network->network.ies + sizeof(struct ndis_802_11_fix_ie);
 

drivers/staging/rtl8723bs/core/rtw_mlme.c static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net · line 1118

Quoted 2 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1

-	rtw_update_ht_cap(padapter, cur_network->network.ies, cur_network->network.ie_length, (u8) cur_network->network.configuration.ds_config);
+	rtw_update_protection(padapter, ie, (cur_network->network.ie_length));

The original code had a potential buffer over-read here by passing the full ie_length with an offset pointer. Since you are refactoring this line, please fix this bug, in a separate patch, by subtracting the offset from the length and ensuring the length is actually large enough first. 1/X of the patch series should be bug fix, 2/X should be this cleanup. Don't forget to add Fixes and Reported-by tags. Check if this bug is present in stable tree and if so add Cc: [email protected] as well.

drivers/staging/rtl8723bs/core/rtw_mlme.c static int rtw_check_roaming_candidate(struct mlme_priv *mlme · line 1767

Quoted 6 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1

@@ -1684,7 +1764,9 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlme
 	if (jiffies_to_msecs(jiffies - competitor->last_scanned) >= mlme->roam_scanr_exp_ms)
 		goto exit;
 
-	if (competitor->network.rssi - mlme->cur_network_scanned->network.rssi < mlme->roam_rssi_diff_th)
+	long rssi_diff = competitor->network.rssi - mlme->cur_network_scanned->network.rssi;

You are declaring a variable (rssi_diff) after executable code again. All declarations must be at the top of the function. Additionally, why use long here?

Quoted 5 lines

glad to see v2, just one thing before inline reviews of the code. You don't have to state what did you do to make lines shorter than 100 characters, because we can read the diff and this commit message is too long for cleanup patch.

Understood. Will keep it shorter in v3.

Quoted 10 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea · line 375

Quoted 5 lines

}

drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -1

-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)

					    ^^^^^

This is still not aligned correctly. Please do it like:
struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue,
struct wlan_network *network)

Will investigate and fix the alignment issues in v3.

Quoted 11 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex · line 473

Quoted 6 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1

@@ -462,10 +470,12 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex
 		&pmlmepriv->cur_network.network,
 		&pmlmepriv->cur_network.network);
 
-	if (check_fwstate(pmlmepriv, _FW_LINKED) && (is_same_network(&pmlmepriv->cur_network.network, pnetwork, 0))) {
+	u8 *ie = pmlmepriv->cur_network.network.ies + sizeof(struct ndis_802_11_fix_ie);

You should declare u8 *ie inside the if statement to reduce its scope as much as possible and if left this way it will declare it even if condition is false.

Quoted 7 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex · line 477

Quoted 4 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -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);

Put u8 *ie ... here, under update_network.

Should variables always be declared at the nearest enclosing scope where they're used, or at the top of the function?

Quoted 11 lines

Quoted 11 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -2

-		rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + sizeof(struct ndis_802_11_fix_ie),
-								pmlmepriv->cur_network.network.ie_length);
+		rtw_update_protection(adapter, ie, pmlmepriv->cur_network.network.ie_length);
 	}
 }
 

@@ -600,12 +610,16 @@ static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network
 	desired_encmode = psecuritypriv->ndisencryptstatus;
 	privacy = pnetwork->network.privacy;
 

Quoted 11 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c static bool rtw_is_desired_network(struct adapter *adapter, struct wlan_network · line 616

Quoted 4 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -0

+	u8 *ie_ptr = pnetwork->network.ies + _FIXED_IE_LENGTH_;
+	u32 ie_len_val = pnetwork->network.ie_length - _FIXED_IE_LENGTH_;
+
 	if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) {

Again you should move two variables declared above here, inside if statement. Additionally, calculating ie_len_val outside the check is risky. You should ensure ie_length is actually greater than _FIXED_IE_LENGTH_ before performing the subtraction to prevent an unsigned underflow/wrap-around.

Should the guard be a simple early return if ie_length is smaller than the offset, or is there a preferred pattern for this?

Quoted 9 lines

Quoted 9 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -2

@@ -1072,10 +1113,13 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
 			break;
 	}
 
-	rtw_update_protection(padapter, (cur_network->network.ies) + sizeof(struct ndis_802_11_fix_ie),
-									(cur_network->network.ie_length));
+	u8 *ie = cur_network->network.ies + sizeof(struct ndis_802_11_fix_ie);
 

Quoted 12 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net · line 1118

Quoted 2 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1

-	rtw_update_ht_cap(padapter, cur_network->network.ies, cur_network->network.ie_length, (u8) cur_network->network.configuration.ds_config);
+	rtw_update_protection(padapter, ie, (cur_network->network.ie_length));

The original code had a potential buffer over-read here by passing the full ie_length with an offset pointer. Since you are refactoring this line, please fix this bug, in a separate patch, by subtracting the offset from the length and ensuring the length is actually large enough first. 1/X of the patch series should be bug fix, 2/X should be this cleanup. Don't forget to add Fixes and Reported-by tags. Check if this bug is present in stable tree and if so add Cc: [email protected] as well.

Should this bug fix be in the same patch that will fix previously mentioned subtraction underflow(s)?

Quoted 5 lines

Quoted 5 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +0 -0

@@ -1684,7 +1764,9 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlme
 	if (jiffies_to_msecs(jiffies - competitor->last_scanned) >= mlme->roam_scanr_exp_ms)
 		goto exit;
 

Quoted 7 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c static int rtw_check_roaming_candidate(struct mlme_priv *mlme · line 1767

Quoted 2 lines

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1

-	if (competitor->network.rssi - mlme->cur_network_scanned->network.rssi < mlme->roam_rssi_diff_th)
+	long rssi_diff = competitor->network.rssi - mlme->cur_network_scanned->network.rssi;

You are declaring a variable (rssi_diff) after executable code again. All declarations must be at the top of the function. Additionally, why use long here?

The type of rssi in struct wlan_bssid_ex is long so I matched it. Will double check and correct if needed.

Cheers,
Salman Alghamdi.

On April 26, 2026 4:33:23 AM GMT+02:00, Salman Alghamdi <[email protected]> wrote:

Quoted 4 lines

Quoted 3 lines

Put u8 *ie ... here, under update_network.

Quoted 2 lines

Should variables always be declared at the nearest enclosing scope where they're used, or at the top of the function?

Generally nearest scope, but in this case you should declare u8 *ie inside the block and after update_network(), because by doing that you ensure the pointer is initialized with the freshest data. It also prevents the variable from being used elsewhere in the function where it might be invalid.