From: "Jose A. Perez de Azpillaga" <azpijr@gmail.com>
To: linux-staging@lists.linux.dev
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Michael Straube <straube.linux@gmail.com>,
Hans de Goede <hansg@kernel.org>,
Khushal Chitturi <khushalchitturi@gmail.com>,
Dan Carpenter <dan.carpenter@linaro.org>,
Vivek BalachandharTN <vivek.balachandhar@gmail.com>,
Ethan Tidmore <ethantidmore06@gmail.com>,
Luka Gejak <luka.gejak@linux.dev>,
Artur Stupa <arthur.stupa@gmail.com>,
Zhuoheng Li <lizhuoheng@kylinos.cn>,
Nino Zhang <ninozhang001@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 1/2] staging: rtl8723bs: remove dead REJOIN code
Date: Fri, 20 Mar 2026 00:13:34 +0100 [thread overview]
Message-ID: <20260319231344.569418-2-azpijr@gmail.com> (raw)
In-Reply-To: <20260319231344.569418-1-azpijr@gmail.com>
The REJOIN macro is not defined anywhere in the kernel tree. Remove this
dead code to simplify the function.
Signed-off-by: Jose A. Perez de Azpillaga <azpijr@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme.c | 26 ++---------------------
1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 2adc98c955fd..805427353aa6 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1153,7 +1153,6 @@ void rtw_reset_securitypriv(struct adapter *adapter)
/* 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). */
/* */
-/* define REJOIN */
void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
{
static u8 __maybe_unused retry;
@@ -1250,29 +1249,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
} else {/* if join_res < 0 (join fails), then try again */
-
- #ifdef REJOIN
- res = _FAIL;
- if (retry < 2)
- res = rtw_select_and_join_from_scanned_queue(pmlmepriv);
-
- if (res == _SUCCESS) {
- /* extend time of assoc_timer */
- _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
- retry++;
- } else if (res == 2) {/* there is no need to wait for join */
- _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
- rtw_indicate_connect(adapter);
- } else {
- #endif
-
- _set_timer(&pmlmepriv->assoc_timer, 1);
- _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
-
- #ifdef REJOIN
- retry = 0;
- }
- #endif
+ _set_timer(&pmlmepriv->assoc_timer, 1);
+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
}
ignore_joinbss_callback:
--
2.53.0
next prev parent reply other threads:[~2026-03-19 23:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-19 23:13 [PATCH v2 0/2] staging: rtl8723bs: clean up rtw_joinbss_event_prehandle Jose A. Perez de Azpillaga
2026-03-19 23:13 ` Jose A. Perez de Azpillaga [this message]
2026-03-19 23:13 ` [PATCH v2 2/2] staging: rtl8723bs: refactor rtw_joinbss_event_prehandle to reduce indentation Jose A. Perez de Azpillaga
2026-03-20 8:05 ` Luka Gejak
2026-03-20 9:40 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260319231344.569418-2-azpijr@gmail.com \
--to=azpijr@gmail.com \
--cc=arthur.stupa@gmail.com \
--cc=dan.carpenter@linaro.org \
--cc=ethantidmore06@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hansg@kernel.org \
--cc=khushalchitturi@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=lizhuoheng@kylinos.cn \
--cc=luka.gejak@linux.dev \
--cc=ninozhang001@gmail.com \
--cc=straube.linux@gmail.com \
--cc=vivek.balachandhar@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox