From nobody Fri Sep 19 09:03:10 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAC27C46467 for ; Sat, 26 Nov 2022 15:43:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229675AbiKZPnO (ORCPT ); Sat, 26 Nov 2022 10:43:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229614AbiKZPnH (ORCPT ); Sat, 26 Nov 2022 10:43:07 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E44FCE20 for ; Sat, 26 Nov 2022 07:43:06 -0800 (PST) Received: from dslb-188-096-151-149.188.096.pools.vodafone-ip.de ([188.96.151.149] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oyxKW-0000Lt-Mt; Sat, 26 Nov 2022 16:43:00 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 3/5] staging: r8188eu: fix the number of probereq retries Date: Sat, 26 Nov 2022 16:42:51 +0100 Message-Id: <20221126154253.178275-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221126154253.178275-1-martin@kaiser.cx> References: <20221126154253.178275-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" issue_probereq_ex sends a probe request and retries if this fails. There's no point in making the number of retries configurable. Hard-code the value that's used by issue_probereq_ex's only caller. Simplify the code to check the loop condition only once. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 21 +++++++------------ .../staging/r8188eu/include/rtw_mlme_ext.h | 3 +-- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 990336244030..667f54e313ef 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -4482,21 +4482,16 @@ inline void issue_probereq(struct adapter *padapter= , struct ndis_802_11_ssid *ps _issue_probereq(padapter, pssid, da, false); } =20 -void issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *= pssid, u8 *da, - int try_cnt) +void issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *= pssid, u8 *da) { - int ret; - int i =3D 0; - - do { - ret =3D _issue_probereq(padapter, pssid, da, true); - - i++; + int i; =20 - if (i < try_cnt && ret =3D=3D _FAIL) + for (i =3D 0; i < 3; i++) { + if (_issue_probereq(padapter, pssid, da, true) =3D=3D _FAIL) msleep(1); - - } while ((i < try_cnt) && (ret =3D=3D _FAIL)); + else + break; + } } =20 /* if psta =3D=3D NULL, indicate we are station (client) now... */ @@ -7046,7 +7041,7 @@ void linked_status_chk(struct adapter *padapter) } =20 if (rx_chk !=3D _SUCCESS) - issue_probereq_ex(padapter, &pmlmeinfo->network.Ssid, psta->hwaddr, 3= ); + issue_probereq_ex(padapter, &pmlmeinfo->network.Ssid, psta->hwaddr); =20 if ((tx_chk !=3D _SUCCESS && pmlmeinfo->link_count++ =3D=3D 0xf) || rx= _chk !=3D _SUCCESS) { tx_chk =3D issue_nulldata(padapter, psta->hwaddr, 0, 3, 1); diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 04fd673d3a04..089bd5446773 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -512,8 +512,7 @@ void issue_auth(struct adapter *padapter, struct sta_in= fo *psta, unsigned short status); void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pss= id, u8 *da); -void issue_probereq_ex(struct adapter *adapter, struct ndis_802_11_ssid *p= ssid, - u8 *da, int try_cnt); +void 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); int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, --=20 2.30.2