diff options
| author | Leonardo Martins Martins <dev.lmmrtns@gmail.com> | 2026-09-03 02:18:07 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-09-07 18:25:24 +0200 |
| commit | 4bce2289cdffa8a0d1acc9f87325e9a98ac5e2fe (patch) | |
| tree | bd15fbb869fa1db20cbb7378ca3b5262d6e8e4ee | |
| parent | d03ddece7edef9eebe657a4780441532b5ec8e4b (diff) | |
| download | linux-next-4bce2289cdffa8a0d1acc9f87325e9a98ac5e2fe.tar.gz linux-next-4bce2289cdffa8a0d1acc9f87325e9a98ac5e2fe.zip | |
staging: rtl8723bs: remove invariant parameters from issue_probereq_ex()
The parameters ch, append_wps, try_cnt and wait_ms are 0 in all usages
of issue_probereq_ex(), remove them. With try_cnt always being 0, the
condition (i < try_cnt) is always false, so the do-while statement is
redundant and the msleep() call is unreachable, (wait_ms > 0) is also
always false, and without the do-while and msleep() the conditional
break is also redundant, remove all this dead code.
Signed-off-by: Leonardo Martins Martins <dev.lmmrtns@gmail.com>
Link: https://patch.msgid.link/20260903-issue_probereq-v1-1-82f153d157a1@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 33 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 |
2 files changed, 10 insertions, 25 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index 0c00be09fbf3..4bdd2ae24d27 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -2499,25 +2499,11 @@ inline void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps _issue_probereq(padapter, pssid, da, 0, 1, false); } -int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, u8 ch, bool append_wps, - int try_cnt, int wait_ms) +int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da) { int ret; - int i = 0; - - do { - ret = _issue_probereq(padapter, pssid, da, ch, append_wps, - wait_ms > 0); - i++; - - if (padapter->driver_stopped || padapter->bSurpriseRemoved) - break; - - if (i < try_cnt && wait_ms > 0 && ret == _FAIL) - msleep(wait_ms); - - } while ((i < try_cnt) && ((ret == _FAIL) || (wait_ms == 0))); + ret = _issue_probereq(padapter, pssid, da, 0, 0, false); if (ret != _FAIL) { ret = _SUCCESS; @@ -3768,7 +3754,9 @@ void site_survey(struct adapter *padapter) if (padapter->registrypriv.wifi_spec) issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL); else - issue_probereq_ex(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL, 0, 0, 0, 0); + issue_probereq_ex(padapter, + &pmlmeext->sitesurvey_res.ssid[i], + NULL); issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL); } @@ -3778,7 +3766,7 @@ void site_survey(struct adapter *padapter) if (padapter->registrypriv.wifi_spec) issue_probereq(padapter, NULL, NULL); else - issue_probereq_ex(padapter, NULL, NULL, 0, 0, 0, 0); + issue_probereq_ex(padapter, NULL, NULL); issue_probereq(padapter, NULL, NULL); } } @@ -4899,16 +4887,13 @@ void linked_status_chk(struct adapter *padapter) if (pmlmeext->retry == 0) { issue_probereq_ex(padapter, &pmlmeinfo->network.ssid, - pmlmeinfo->network.mac_address, - 0, 0, 0, 0); + pmlmeinfo->network.mac_address); issue_probereq_ex(padapter, &pmlmeinfo->network.ssid, - pmlmeinfo->network.mac_address, - 0, 0, 0, 0); + pmlmeinfo->network.mac_address); issue_probereq_ex(padapter, &pmlmeinfo->network.ssid, - pmlmeinfo->network.mac_address, - 0, 0, 0, 0); + pmlmeinfo->network.mac_address); } } diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h index 70fb161afd09..acea9cef7756 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -542,7 +542,7 @@ void issue_assocreq(struct adapter *padapter); void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type); void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short status); void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da); -s32 issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, u8 ch, bool append_wps, int try_cnt, int wait_ms); +s32 issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da); int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms); s32 issue_nulldata_in_interrupt(struct adapter *padapter, u8 *da); int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int try_cnt, int wait_ms); |