From nobody Fri Jun 19 08:01:03 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 E03162765E2; Sun, 26 Apr 2026 22:58:15 +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=1777244297; cv=none; b=SuRonAI6awdI9m0OYzeeUKyGLq8PPmxleHLiFSbdALGthOYLcBKXVbS2lQk5e2hxQr/xYMsMJLhNsCmQkSlYhdjFo+qSHDL2SPsgSsU0Rb+LmZvj0FDgi6gcrs+banbBYAPj8RWSCglNOAxbzjfckgFfiC3rvyBp+/6iR1r4pHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777244297; c=relaxed/simple; bh=rZHYkXggah79PkVFN+6E/RKD6b6tAyfkViysUFDb8oc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ut/LNkhp5+6LOJQXK/f90fdjwQR2B35qIYY1cZA1dRaaW7Q8zyLHNMByvkPWwVc351zmSXultsMwxuGzsVYIGzVfxE6eWUO3ktDj7HcXnhW/PIgon9peBrqdMoTu2hzVszq/EV+lLhTeaRNm/t9eNWAhMNTHSOpmaaflIoFeLiI= 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=Vd9A6aaI; 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="Vd9A6aaI" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id A145184F26; Mon, 27 Apr 2026 01:58:13 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1777244294; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=9UgJASqxAWAeh3eiXQ4y7gcX7HLK+OapSPbuxmiLW5Y=; b=Vd9A6aaI+bM4qV7mnrXqO4bPHEAgpoXKLbwMI3+5784rlIzfxKObcJ+YmUQqVf/HGlNFfo lQpw6ClEaNfhLCCja5GBTfvwSVUyYjsS82xkb6eUFiETF0tHT5YeXo66Z/v6uSdKLEbEDF 0HEtQJZjl4/PyDlnUkmFasYAQqmfdiXdGVzie3g9ITJ3xj9h4K7rU6PxWJSPtw9Bw9+DYI edW50yNNUSrO/cfmw8l+/O9A0oAB0N9y+QPJ4HTLed4JFqO8aHyfxJOcdqL9ziETpp6TyP gh1KNDsnWe+rPgYREiOCcTIt+yM5VKpsHiK3P6LHx3DqeYR7RRQv4h9hzcGV/XDFRIgvM9 rM2MrqlQjUOxjokWEvodDc26PjlQtL2ZYKbDfAq8OC4tRRPFA1DsP1o7jbZ84kzQXqtCqw w0IKHl3/mUEWcN1iK8sPHDtBjdw03xPh1JZ8g1m7UW7FvyxYO01Z6ub3g6qGLVb0mEGr+I GdzrXftYkfPq498LZDO68SKP8MWUkRQXdZEaGYvEtusj8xc69lsh1nXhWKV+A/Wdjz1M06 tcJmkFqF+B2zFNKnNdH4twTzMaRsP33RoBAV1QpFgc9trQ6AuUrZrd7URxDz1sU8jCMA81 KtLzVZqBjTix+lPKDyaDu4WtK+bHDLT4SQ+5cYwAWBJausAJ1HPYw= From: Salman Alghamdi To: gregkh@linuxfoundation.org Cc: luka.gejak@linux.dev, straube.linux@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v3 1/5] staging: rtl8723bs: fix buffer over-read in rtw_update_protection Date: Mon, 27 Apr 2026 01:54:58 +0300 Message-ID: <20260426225552.87114-2-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260426225552.87114-1-me@cipherat.com> References: <20260426225552.87114-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" rtw_update_protection() is called with a pointer offset into the ies buffer but the full ie_length is passed, causing a potential buffer over-read. Fixes: e945c43df60b ("Staging: rtl8723bs: Delete dead code from update_curr= ent_network()") Fixes: d3fcee1b78a5 ("staging: rtl8723bs: fix camel case in struct wlan_bss= id_ex") Reported-by: Luka Gejak Closes: https://lore.kernel.org/linux-staging/DI2H39EAAFBZ.3KI5NWN02AQ2S@li= nux.dev Cc: stable@vger.kernel.org Signed-off-by: Salman Alghamdi --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index ddfc56f0253d..268f294528e6 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -464,8 +464,11 @@ static void update_current_network(struct adapter *ada= pter, struct wlan_bssid_ex =20 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; + rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + si= zeof(struct ndis_802_11_fix_ie), - pmlmepriv->cur_network.network.ie_length); + pmlmepriv->cur_network.network.ie_length - sizeof(struct ndis_802_= 11_fix_ie)); } } =20 @@ -1072,8 +1075,11 @@ static void rtw_joinbss_update_network(struct adapte= r *padapter, struct wlan_net break; } =20 + if (cur_network->network.ie_length < sizeof(struct ndis_802_11_fix_ie)) + return; + rtw_update_protection(padapter, (cur_network->network.ies) + sizeof(struc= t ndis_802_11_fix_ie), - (cur_network->network.ie_length)); + (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); } --=20 2.54.0 From nobody Fri Jun 19 08:01:03 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 B867C2FB97B for ; Sun, 26 Apr 2026 22:58:17 +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=1777244301; cv=none; b=uvtAEj6gxfjG9dNyeDBpXYslbnclAGmwnDbGjdC+bgkgyhCGsT5HDdbvhvKE1n07HpBlVcdaGt/8HAfjBPjMuVO6gKTE3ruTqQaoDPjl1ILKcm3hNO4LwKyk0xPcNg8gBaNYsnrXs0UJqwWw7cdN3oKQsGjZKahR/0aGI6oyb0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777244301; c=relaxed/simple; bh=mf8OxE08omFhfqBAY1hgjw8Il8Y68nj/E+k+hfYiYQU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WaPm2Z42GLmmBRWH00MvXG5YlBY03EduxYhGn4KlwRIifZ2HHHCl+zBtZ1G6mdAnJA17YLVENkgeApOx++Jmzyo990jU/hQrBUYwNCiOleIwSgQ2qk+dNg7gmNi0TZg23BTVe5LAXtT3OSB6q1nl1cNxPlDlPa70mqnwWLKi1Fs= 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=nddZAMH6; 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="nddZAMH6" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id B158684F2A; Mon, 27 Apr 2026 01:58:15 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1777244296; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=olEfVD2j/opnVKNkp7z4tHaq6a8qoVFK5ECeBr0aBHQ=; b=nddZAMH62yPm08cnQ1ZwHgIy8dGUHDIfEQ54hPavZL3oczLJCqlT1xbeJCEJJlxRJC7zBe LBDsyfIAvLip/1I6GKA14u/3xXw5ufvse392/fsUTM5QPMjFf1zTVefCksOVEeEVRsA7Cc wrhePtGhsaFWx3eAVOWxY0X3++kfl0B55q+hGbItygnJtftlUskAh9bXgxNt8AIO0AJ4MR ClvFFTb9Ep35XxILyAt/4pD6zM7lgXJCbrNUTSgdT0VWizyJeqDDH0MHElNckZ70pi3pZi VL8+Bc0EjJ8NRVp8kxpIo9u8zsoCfUO7n+6YQM3sjNPIwxivTMCMyXxPI+vOQv/zIceQ33 y0ol2i8PwpFZrH0Job3Lwo6GNrdRUeOP1eGtV7Oo3EBjS1yQiryCeD5mSjZXGNgeuQk1Zt ZOaGhRqJUMvbq0Dtb4C626uvI5Y4BNuqowTF2hDjvU946x8aCT1aMo9+sFqPYrQmExH5iJ CfAbETE4zjLzm4PPKL5jX11agosIDTpbM/jzNlY0h3bcHgMCBgW/a3W3+VdXuIjaM3pqzC Kp8QqMJFK4YK6F1A9pFKje+KVJoAqiVaUCGhOyEBxVVGK9aTXEt8yUMd+1Qv2xIitlGlof rRSrVCjRhKrfXoe2qv2asQffm7Qgn+jhlQS2xYy9VJD6/bpIYEYxw= From: Salman Alghamdi To: gregkh@linuxfoundation.org Cc: luka.gejak@linux.dev, straube.linux@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/5] staging: rtl8723bs: rtw_mlme: fix lines exceeding 100 columns Date: Mon, 27 Apr 2026 01:54:59 +0300 Message-ID: <20260426225552.87114-3-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260426225552.87114-1-me@cipherat.com> References: <20260426225552.87114-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 and extract local variables to bring all lines within the 100 column limit. Signed-off-by: Salman Alghamdi --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 284 +++++++++++++++------- 1 file changed, 201 insertions(+), 83 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 268f294528e6..cdc631464565 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 varable 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,13 +472,18 @@ static void update_current_network(struct adapter *ad= apter, 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))) { + 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 @@ -604,7 +619,16 @@ static bool rtw_is_desired_network(struct adapter *ada= pter, struct wlan_network privacy =3D pnetwork->network.privacy; =20 if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) { - if (rtw_get_wps_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, pnetwork->= network.ie_length - _FIXED_IE_LENGTH_, NULL, &wps_ielen)) + u8 *ie_ptr; + u32 ie_len_val; + + if (pnetwork->network.ie_length < _FIXED_IE_LENGTH_) + return false; + + ie_ptr =3D pnetwork->network.ies + _FIXED_IE_LENGTH_; + ie_len_val =3D pnetwork->network.ie_length - _FIXED_IE_LENGTH_; + + if (rtw_get_wps_ie(ie_ptr, ie_len_val, NULL, &wps_ielen)) return true; else return false; @@ -617,11 +641,20 @@ static bool rtw_is_desired_network(struct adapter *ad= apter, struct wlan_network bselected =3D false; =20 if (psecuritypriv->ndisauthtype =3D=3D Ndis802_11AuthModeWPA2PSK) { - p =3D rtw_get_ie(pnetwork->network.ies + _BEACON_IE_OFFSET_, WLAN_EID_R= SN, &ie_len, (pnetwork->network.ie_length - _BEACON_IE_OFFSET_)); - if (p && ie_len > 0) - bselected =3D true; - else + u8 *ie_ptr; + u32 ie_len_val; + + if (pnetwork->network.ie_length < _BEACON_IE_OFFSET_) { bselected =3D false; + } else { + ie_ptr =3D pnetwork->network.ies + _BEACON_IE_OFFSET_; + ie_len_val =3D pnetwork->network.ie_length - _BEACON_IE_OFFSET_; + p =3D rtw_get_ie(ie_ptr, WLAN_EID_RSN, &ie_len, ie_len_val); + if (p && ie_len > 0) + bselected =3D true; + else + bselected =3D false; + } } } =20 @@ -629,7 +662,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 @@ -657,12 +696,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); @@ -713,13 +754,17 @@ void rtw_surveydone_event_callback(struct adapter *ad= apter, u8 *pbuf) _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); } else { u8 ret =3D _SUCCESS; - struct wlan_bssid_ex *pdev_network =3D &adapter->registrypriv.dev_= network; - u8 *pibss =3D adapter->registrypriv.dev_network.mac_address; + 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; =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); @@ -746,9 +791,13 @@ void rtw_surveydone_event_callback(struct adapter *ada= pter, 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_set_to_roam(adapter, 0); + rtw_free_assoc_resources(adapter, 1); + rtw_indicate_disconnect(adapter); + } else if (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); @@ -766,8 +815,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); } } } @@ -951,7 +1002,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; @@ -1008,7 +1060,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(indicat= e_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]; @@ -1025,7 +1079,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; } } } @@ -1035,10 +1090,12 @@ static struct sta_info *rtw_joinbss_update_stainfo(= struct 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 wl= an_network *ptarget_wlan, + struct wlan_network *pnetwork) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct wlan_network *cur_network =3D &pmlmepriv->cur_network; + u8 signal_strength =3D ptarget_wlan->network.phy_info.signal_strength; =20 /* why not use ptarget_wlan?? */ memcpy(&cur_network->network, &pnetwork->network, pnetwork->network.lengt= h); @@ -1050,10 +1107,12 @@ static void rtw_joinbss_update_network(struct adapt= er *padapter, struct wlan_net =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->netwo= rk.phy_info.signal_strength instead (has scaled) */ - padapter->recvpriv.rssi =3D translate_percentage_to_dbm(ptarget_wlan->net= work.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 =3D translate_percentage_to_dbm(signal_strength); =20 rtw_set_signal_stat_timer(&padapter->recvpriv); =20 @@ -1078,10 +1137,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]; @@ -1101,9 +1162,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; @@ -1114,8 +1178,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; @@ -1147,9 +1214,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) { @@ -1161,7 +1232,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)) @@ -1201,9 +1273,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 @@ -1211,7 +1285,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; @@ -1236,7 +1311,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) { @@ -1304,7 +1381,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 @@ -1329,7 +1407,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); @@ -1356,7 +1437,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; @@ -1413,16 +1495,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 { @@ -1436,7 +1521,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); @@ -1450,12 +1536,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); @@ -1465,9 +1553,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 @@ -1538,7 +1628,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 @@ -1584,11 +1676,13 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *a= dapter) static void rtw_auto_scan_handler(struct adapter *padapter) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + unsigned int elapsed_ms; =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) { + elapsed_ms =3D jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time); + + if (pmlmepriv->auto_scan_int_ms !=3D 0 && elapsed_ms > pmlmepriv->auto_sc= an_int_ms) { if (!padapter->registrypriv.wifi_spec) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) goto exit; @@ -1630,7 +1724,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 { @@ -1673,6 +1769,7 @@ static int rtw_check_roaming_candidate(struct mlme_pr= iv *mlme { int updated =3D false; struct adapter *adapter =3D container_of(mlme, struct adapter, mlmepriv); + long rssi_diff; =20 if (is_same_ess(&competitor->network, &mlme->cur_network.network) =3D=3D = false) goto exit; @@ -1690,7 +1787,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) @@ -1763,9 +1861,12 @@ 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) - ) + u8 *ssid_comp =3D competitor->network.ssid.ssid; + u8 *ssid_mlme =3D mlme->assoc_ssid.ssid; + u32 len_comp =3D competitor->network.ssid.ssid_length; + u32 len_mlme =3D mlme->assoc_ssid.ssid_length; + + if (len_comp !=3D len_mlme || memcmp(ssid_comp, ssid_mlme, len_mlme)) goto exit; } =20 @@ -1882,7 +1983,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; @@ -1957,7 +2059,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; @@ -2061,7 +2164,8 @@ 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 min_t(typeof(wrqu.data.length), + wrqu.data.length, IW_CUSTOM_MAX); =20 kfree(buff); } @@ -2091,7 +2195,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); } @@ -2129,7 +2234,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 @@ -2159,14 +2265,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->wireless_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 @@ -2178,7 +2288,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 @@ -2268,7 +2380,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; @@ -2349,7 +2462,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 @@ -2415,7 +2529,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); @@ -2425,7 +2540,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: */ } @@ -2438,13 +2554,14 @@ void rtw_update_ht_cap(struct adapter *padapter, u8= *pie, uint ie_len, u8 channe (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & BIT(1)) && (pmlmeinfo->HT_info.infos[0] & BIT(2))) { int i; + u8 *mcs_rate =3D pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate; =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; */ @@ -2558,7 +2675,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 19 08:01:03 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 6BFB330DEBA for ; Sun, 26 Apr 2026 22:58: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=1777244300; cv=none; b=J6eRX2tCEwVeMtQwiJAbn7wUWgAkeGKef/xW7bITZ0YkYNFZ73eOMKWF4YA5sjppVq4U6XgrcdG43x5KS7sIC4CozVVzA7TUNVCwMY2j6DU/wUTP/chFtD+Irs62ruqkrfeN/zF6obTkx8LTawBrtBEH3OTQCXcYiBwedg0BFM8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777244300; c=relaxed/simple; bh=5kGed51Sl+6E6P6tfqRS9OLndovASOUsFXbWMmD/h7Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=foo11tOpink+n7/HYhdMrkfl8hqFSQesL89r8hFxf//efAnkJRaW1lXDnVbsmL76dKPRSlN0oB7YjLys3fdVJMnyqlXpZwxuQ4CAj8QFhSXJtwYH+hqSNGbntqP6nM0cJIcGX+oZxUKCfDpJvugxKf+nZT76dvLlOJhZPgaCyHs= 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=bgBU4o77; 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="bgBU4o77" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 8D62884F2F; Mon, 27 Apr 2026 01:58:17 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1777244297; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=efRI0gXi2ucJKuhjMvMqbM/ByHTDuuhhB9yX60u/1kQ=; b=bgBU4o77fxaekbl+50QBCn6CWVmKMgbNWGD9Hokv7wWPQya2p6HZzpUzH2ZJBPH1/y7MIg KDZgr1dU4CJUMsEVU3JSCAVwBrvPwLbOshoIm4+VXd0pUwzBL4gbq1yXc+Ec/9a42SZCc+ PJwoJOfispAzE3h+qc65uds1G6WJyLgrdDgLdBQ8fFKPxdhFwHeM1ZUdAECsVIpC/qMQqB PKE8tsGMj0f89IyI8zBO8i/U6QYnhJNQ8ONyhGb50h7funLTnILV6X4tg/7lpwodFNE2lv tzGQqIHusaheuZB/428EJU6CH/hD2UIcb6al1souOumGJoP+zuxG5o9A322SeyI2Wgn15a bV+XyHk8ySKChBQkZ9+j0cZj7pk4I9Q8gtpiF3gq5W+f71MOe50/LG4WsOh6gk7EI5niN6 RUcGzAh4EJcmfXvnKkI/rYSYU8fNmLdyoEDZZUMYP0ahprdaQzRz5Pf6OLnRw9YyXsQ0Nz 1H+HlRnVCpg8IbhleZHZ8RtHc1cY/i/NylHdN+58v1kd5GeQDTB/K7OLLQPSg2gQxH+ctb GedcMRKZhEr0Yv1eeR8Wr9X9K9lGs8FBBoKOHxXtUl+DSME622wMqkcbSr5H/RJX6B1zj/ sFk/B/hzPsJNGyRD1g0RzAnQtn9LwtMS0cqlPFjkSkG2fCw68HbaE= From: Salman Alghamdi To: gregkh@linuxfoundation.org Cc: luka.gejak@linux.dev, straube.linux@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/5] staging: rtl8723bs: rtw_mlme: remove dead commented-out code Date: Mon, 27 Apr 2026 01:55:00 +0300 Message-ID: <20260426225552.87114-4-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260426225552.87114-1-me@cipherat.com> References: <20260426225552.87114-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 related comments/notes. Signed-off-by: Salman Alghamdi --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index cdc631464565..c8971c03704c 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -758,9 +758,6 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *pbuf) struct wlan_bssid_ex *pdev_network =3D ®s->dev_network; u8 *pibss =3D regs->dev_network.mac_address; =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, @@ -1721,12 +1718,8 @@ void rtw_dynamic_check_timer_handler(struct adapter = *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); */ 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 { @@ -2265,19 +2258,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->wireless_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 19 08:01:03 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 63D012E62B4 for ; Sun, 26 Apr 2026 22:58: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=1777244302; cv=none; b=XsbEeKyYxbEvQDblQVRPNoJN+iDzjV26xlRIP8ystyzMUM78MecFHfjaVQt12bmVkatuUwjmcAh+dey0NzCj5OjFm4/9sfIPhHf9NescUFhty/u1KDzAi7Td9U5L8lz/1+kLx5hC6KkM4XJtVstuqchsHlkNpizAqKuec8llYGY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777244302; c=relaxed/simple; bh=JroAYwDCCCSR6fSXUMUM1Lb9VtW/9luZpXb6TBHQvvM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hQlVYHKl6IcPR4u99pjG5xv8LaVu8p7d1m2cokP18d0QpGpdaQm7f4e3NT6hLD0HTAJBBqPb3ji8bc6dy+LPmysAzVUcmiskCcTdIuqddERVAP2SuTsD3xwuUaXVwHqvTL+A9iaDK2bGSbcgt4hQTAJYxn3wH74hqcyjWySUN30= 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=uiJTEZn/; 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="uiJTEZn/" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 3E96284F30; Mon, 27 Apr 2026 01:58:19 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1777244299; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=SlM9XwMtVeGr4eZLRP0/gzdPoevGFri5WNqHzwN9As0=; b=uiJTEZn/ct5w24eATYGTtcsHrHWMuaTdccPiqRNcxoWzZH6HuMfsBO/zS+hJwGLaBK8erf G2qKYHIW2S9lzUQY4TYqv6WARB4t4KVjwnIOy76En+hCJ9EHq6H3jvqaXOcgaFE7oboPc6 HeQBlhm3YLsoLEDU88esU+6oVVq7n7y0kphh4HiSBUvEgUVvgMki2jIYN8HziypKKmZG9k T2YElEOpzQeowBUW2Siffkdn4OySj2SvNUMOnKsER63ob8959wINJTFBOWcwPSwZPUddIo M2It9esvBrvf5xY3NHVgt8h3EeNdDBi4/dCtlkep2tmZL7w9F3VR97O7syEFmxv3jdFACc V8OSgseQTFANIwacBmiQGG11E1YaYMsKarn4U6M/MHW0aBB/l1oAXxOJDnJ0oYAgGxpO5Q DCeazK8UEEHmLlQjPuSdSWc41unI74NaFUpsgXhofrOkusF9JWvth2fQebs5WhWxlRQsLA eccT/iyZl2Em8h0sWMJa/YCtISnRFtipX7AmpS66twEdwxAvCc0hdFTirlJwSH/HzYFXy5 IV12P5EodQraxih1YyGRkPAYhkAUTJXhHNBW6yesqLSXAwROOHxgCDs/4DPxYOYHq4Kj/+ ZyjtcEAbrS6XtOmysbhyknPz21L45rly/4fZ/po5H5JCfz91EG4jE= From: Salman Alghamdi To: gregkh@linuxfoundation.org Cc: luka.gejak@linux.dev, straube.linux@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/5] staging: rtl8723bs: rtw_mlme: consolidate capability comparisons lines Date: Mon, 27 Apr 2026 01:55:01 +0300 Message-ID: <20260426225552.87114-5-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260426225552.87114-1-me@cipherat.com> References: <20260426225552.87114-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 c8971c03704c..66d3d55163f2 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 19 08:01:03 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 F1BE8282F27 for ; Sun, 26 Apr 2026 22:58:22 +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=1777244309; cv=none; b=UafrArelNZZ1HjnAbqT9fbcIljtaAMKNMCaPVUGCUx1pDwpIkvqNJBm49xaotdCEb07Y5Tm5jA/lnOp4Y7i+B8FxjwmfWlOTNyQb/OU2jWfUoI7IBe1iaOwLRHbUBbJF5s14Cc6YJAQrCNYJHhYK3rLHgB4sRyY6q4KSaCo5/mw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777244309; c=relaxed/simple; bh=9b2Vin882ceu308MJOQ1C63Faa6n/1UAc0THYj0nQ8g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qPreBqLeo4srjDf8Rf/GKG0el5UhRuXQVMLr2TWiYEiAsLTcWpIRrTSq3vH9+UuTDg9r/+A/KwkcNCinGLz6f15NgDUtRybVLMbeVdKinN5ZHb3sTzNNuXKSXhkchAd1elzq+fFuif/cFxCRYu2OGaHfooN7NQhhAvoB7srGDWU= 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=gUb6qqY3; 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="gUb6qqY3" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 0F20A84F20; Mon, 27 Apr 2026 01:58:20 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipherat.com; s=dkim; t=1777244301; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=z9dr3yX2ure1NYjdZ7Q3HiLis2nbBAmvgq50OR6f71c=; b=gUb6qqY393JzEN1N0BrvrOSprmFj+xioZJmro6/RtSU8r+o3ZwoqVC/XQxH8UobiBDPmEc PGW6ekbxbTYgrPVJVxDe4W09ucXu+J9hRZaJd0Ti8rJWIQDUpc+xTDhVIOTcadELRXIwXU WvHmNqExnLmZ92TzND89T4eNxA5mLepLplavv1rmCoDmay/VB6C92LDSQw9cEHVgcHcu8y j4g9gJ9uIg+xD/NOpJy7kktziYRXo6YZgO0SFD1pOyvQ95CFDFntItZr6L4dDFFSRLMpst zkhurj91k06ZuNUdBr/HTo8EsOYT7oZuTaYbGrAxscRWE63ojQj+BzwBsP8gK4jjJKf6mC 5g6FQg8Hoa0O+rQk09AexzVUsI2e5wYTT8VAAm1+GFIN4Ae5yHbCHUokeWhzN+bAt84GtF e3mrfM9MfuzEBFIcnsoLUIuLpA3aVAG3TVce5oNVi4yQ2i1FxdLTB74mY18ClD437B7ObD YPsDuFdWnoHGurEGXzaggheYTbtMW4aS+VcIClbt/7L14VTDsD9OQDyhK0hI0ZGMdKxgEr GmLONmkZlQymAIVg8qoCZH25gglBu5ggbSu3IrU68wc+S04HXU6QI2ANrxvNCtBYSfihGL 9mKXZQp8sx1+9c9XcI72PH5hYgoQhIc3oJriIwi5XUc+1DCfy9usM= From: Salman Alghamdi To: gregkh@linuxfoundation.org Cc: luka.gejak@linux.dev, straube.linux@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/5] staging: rtl8723bs: rtw_mlme: add blank line for readability Date: Mon, 27 Apr 2026 01:55:02 +0300 Message-ID: <20260426225552.87114-6-me@cipherat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260426225552.87114-1-me@cipherat.com> References: <20260426225552.87114-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 66d3d55163f2..a2e9516c328e 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -631,6 +631,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