Skip to content

Commit 96e82c7

Browse files
Onebit5gregkh
authored andcommitted
staging: rtl8723bs: remove dead REJOIN code
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> Reviewed-by: Luka Gejak <luka.gejak@linux.dev> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://patch.msgid.link/20260321182713.665872-2-azpijr@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e23ad15 commit 96e82c7

1 file changed

Lines changed: 2 additions & 26 deletions

File tree

drivers/staging/rtl8723bs/core/rtw_mlme.c

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,10 +1145,8 @@ void rtw_reset_securitypriv(struct adapter *adapter)
11451145
/* if join_res > 0, for (fw_state ==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist. */
11461146
/* if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan != NULL). */
11471147
/* */
1148-
/* define REJOIN */
11491148
void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
11501149
{
1151-
static u8 __maybe_unused retry;
11521150
struct sta_info *ptarget_sta = NULL, *pcur_sta = NULL;
11531151
struct sta_priv *pstapriv = &adapter->stapriv;
11541152
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@@ -1170,7 +1168,6 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
11701168

11711169
if (pnetwork->join_res > 0) {
11721170
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
1173-
retry = 0;
11741171
if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) {
11751172
/* s1. find ptarget_wlan */
11761173
if (check_fwstate(pmlmepriv, _FW_LINKED)) {
@@ -1242,29 +1239,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
12421239
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
12431240

12441241
} else {/* if join_res < 0 (join fails), then try again */
1245-
1246-
#ifdef REJOIN
1247-
res = _FAIL;
1248-
if (retry < 2)
1249-
res = rtw_select_and_join_from_scanned_queue(pmlmepriv);
1250-
1251-
if (res == _SUCCESS) {
1252-
/* extend time of assoc_timer */
1253-
_set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
1254-
retry++;
1255-
} else if (res == 2) {/* there is no need to wait for join */
1256-
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
1257-
rtw_indicate_connect(adapter);
1258-
} else {
1259-
#endif
1260-
1261-
_set_timer(&pmlmepriv->assoc_timer, 1);
1262-
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
1263-
1264-
#ifdef REJOIN
1265-
retry = 0;
1266-
}
1267-
#endif
1242+
_set_timer(&pmlmepriv->assoc_timer, 1);
1243+
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
12681244
}
12691245

12701246
ignore_joinbss_callback:

0 commit comments

Comments
 (0)