From: Martin Kaiser <martin@kaiser.cx>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Michael Straube <straube.linux@gmail.com>,
Pavel Skripkin <paskripkin@gmail.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Martin Kaiser <martin@kaiser.cx>
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 [thread overview]
Message-ID: <20221030173326.1588647-13-martin@kaiser.cx> (raw)
In-Reply-To: <20221030173326.1588647-1-martin@kaiser.cx>
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 <martin@kaiser.cx>
---
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 *adapter, u8 *da)
_issue_probereq_p2p(adapter, da);
}
-static s32 rtw_action_public_decache(struct recv_frame *recv_frame, s32 token)
+static s32 rtw_action_public_decache(struct recv_frame *recv_frame, u8 token)
{
struct adapter *adapter = recv_frame->adapter;
struct mlme_ext_priv *mlmeext = &adapter->mlmeextpriv;
@@ -3499,21 +3499,13 @@ static s32 rtw_action_public_decache(struct recv_frame *recv_frame, s32 token)
(recv_frame->attrib.frag_num & 0xf);
if (GetRetry(frame)) {
- if (token >= 0) {
- if ((seq_ctrl == mlmeext->action_public_rxseq) &&
- (token == mlmeext->action_public_dialog_token))
- return _FAIL;
- } else {
- if (seq_ctrl == mlmeext->action_public_rxseq)
- return _FAIL;
- }
+ if ((seq_ctrl == mlmeext->action_public_rxseq) &&
+ (token == mlmeext->action_public_dialog_token))
+ return _FAIL;
}
mlmeext->action_public_rxseq = seq_ctrl;
-
- if (token >= 0)
- mlmeext->action_public_dialog_token = token;
-
+ mlmeext->action_public_dialog_token = token;
return _SUCCESS;
}
--
2.30.2
next prev parent reply other threads:[~2022-10-30 17:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-30 17:33 [PATCH v2 00/13] staging: r8188eu: clean up action frame handlers Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 01/13] staging: r8188eu: replace a GetAddr1Ptr call Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 02/13] staging: r8188eu: remove duplicate category check Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 03/13] staging: r8188eu: make on_action_public static void Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 04/13] staging: r8188eu: make OnAction_back " Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 05/13] staging: r8188eu: make OnAction_p2p " Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 06/13] staging: r8188eu: remove category check in OnAction_p2p Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 07/13] staging: r8188eu: replace switch-case with if Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 08/13] staging: r8188eu: replace GetAddr1Ptr call in OnAction_p2p Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 09/13] staging: r8188eu: clean up on_action_public Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 10/13] staging: r8188eu: remove return value from on_action_public_vendor Martin Kaiser
2022-10-30 17:33 ` [PATCH v2 11/13] staging: r8188eu: remove return value from on_action_public_default Martin Kaiser
2022-10-30 17:33 ` Martin Kaiser [this message]
2022-10-30 17:33 ` [PATCH v2 13/13] staging: r8188eu: check destination address in OnAction Martin Kaiser
2022-10-30 18:17 ` [PATCH v2 00/13] staging: r8188eu: clean up action frame handlers Philipp Hortmann
2022-10-30 18:48 ` Martin Kaiser
2022-10-30 19:15 ` Philipp Hortmann
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=20221030173326.1588647-13-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=paskripkin@gmail.com \
--cc=phil@philpotter.co.uk \
--cc=straube.linux@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
all inboxes | Powered by JetHome®