From nobody Wed Apr 8 23:03:37 2026 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 3DAE9C38A02 for ; Sun, 30 Oct 2022 17:34:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230005AbiJ3Re3 (ORCPT ); Sun, 30 Oct 2022 13:34:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229872AbiJ3Rdy (ORCPT ); Sun, 30 Oct 2022 13:33:54 -0400 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 8D59895B4 for ; Sun, 30 Oct 2022 10:33:53 -0700 (PDT) Received: from ipservice-092-217-067-184.092.217.pools.vodafone-ip.de ([92.217.67.184] 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 1opCBy-000469-8K; Sun, 30 Oct 2022 18:33:50 +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 v2 12/13] staging: r8188eu: rtw_action_public_decache's token is a u8 Date: Sun, 30 Oct 2022 18:33:25 +0100 Message-Id: <20221030173326.1588647-13-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221030173326.1588647-1-martin@kaiser.cx> References: <20221030173326.1588647-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" Both callers of rtw_action_public_decache pass a u8 value for the token parameter. We can change token from s32 to u8 and remove the code for token < 0. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index f5923792f067..93f3d387e92d 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -3490,7 +3490,7 @@ inline void issue_probereq_p2p(struct adapter *adapte= r, u8 *da) _issue_probereq_p2p(adapter, da); } =20 -static s32 rtw_action_public_decache(struct recv_frame *recv_frame, s32 to= ken) +static s32 rtw_action_public_decache(struct recv_frame *recv_frame, u8 tok= en) { struct adapter *adapter =3D recv_frame->adapter; struct mlme_ext_priv *mlmeext =3D &adapter->mlmeextpriv; @@ -3499,21 +3499,13 @@ static s32 rtw_action_public_decache(struct recv_fr= ame *recv_frame, s32 token) (recv_frame->attrib.frag_num & 0xf); =20 if (GetRetry(frame)) { - if (token >=3D 0) { - if ((seq_ctrl =3D=3D mlmeext->action_public_rxseq) && - (token =3D=3D mlmeext->action_public_dialog_token)) - return _FAIL; - } else { - if (seq_ctrl =3D=3D mlmeext->action_public_rxseq) - return _FAIL; - } + if ((seq_ctrl =3D=3D mlmeext->action_public_rxseq) && + (token =3D=3D mlmeext->action_public_dialog_token)) + return _FAIL; } =20 mlmeext->action_public_rxseq =3D seq_ctrl; - - if (token >=3D 0) - mlmeext->action_public_dialog_token =3D token; - + mlmeext->action_public_dialog_token =3D token; return _SUCCESS; } =20 --=20 2.30.2