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 13/17] staging: r8188eu: remove unnecessary label
Date: Mon, 24 Oct 2022 10:14:13 +0200 [thread overview]
Message-ID: <20221024081417.66441-14-martin@kaiser.cx> (raw)
In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx>
Remove a label on OnAuthClient that just calls return. We can return
directly instead of jumping to this label.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 074c95f76e27..01fe5019b333 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -823,7 +823,7 @@ static void OnAuthClient(struct adapter *padapter, struct recv_frame *precv_fram
}
set_link_timer(pmlmeext, 1);
- goto authclnt_fail;
+ return;
}
if (seq == 2) {
@@ -833,7 +833,7 @@ static void OnAuthClient(struct adapter *padapter, struct recv_frame *precv_fram
pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);
if (!p)
- goto authclnt_fail;
+ return;
memcpy((void *)(pmlmeinfo->chg_txt), (void *)(p + 2), len);
pmlmeinfo->auth_seq = 3;
@@ -849,18 +849,16 @@ static void OnAuthClient(struct adapter *padapter, struct recv_frame *precv_fram
if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared)
go2asoc = 1;
else
- goto authclnt_fail;
+ return;
} else {
/* this is also illegal */
- goto authclnt_fail;
+ return;
}
if (go2asoc) {
start_clnt_assoc(padapter);
return;
}
-authclnt_fail:
- return;
}
static void UpdateBrateTbl(u8 *mbrate)
--
2.30.2
next prev parent reply other threads:[~2022-10-24 8:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-24 8:14 [PATCH 00/17] staging: r8188eu: clean up mlme handlers Martin Kaiser
2022-10-24 8:14 ` [PATCH 01/17] staging: r8188eu: restructure mlme subfunction handling Martin Kaiser
2022-10-24 8:14 ` [PATCH 02/17] staging: r8188eu: make OnAssocReq static Martin Kaiser
2022-10-24 8:14 ` [PATCH 03/17] staging: r8188eu: make OnAssocRsp static Martin Kaiser
2022-10-24 8:14 ` [PATCH 04/17] staging: r8188eu: make OnProbeReq static Martin Kaiser
2022-10-24 8:14 ` [PATCH 05/17] staging: r8188eu: make OnProbeRsp static Martin Kaiser
2022-10-24 8:14 ` [PATCH 06/17] staging: r8188eu: make OnBeacon static Martin Kaiser
2022-10-24 8:14 ` [PATCH 07/17] staging: r8188eu: make OnDisassoc static Martin Kaiser
2022-10-24 8:14 ` [PATCH 08/17] staging: r8188eu: make OnAuthClient static Martin Kaiser
2022-10-24 8:14 ` [PATCH 09/17] staging: r8188eu: make OnDeAuth static Martin Kaiser
2022-10-24 8:14 ` [PATCH 10/17] staging: r8188eu: make OnAction static Martin Kaiser
2022-10-24 8:14 ` [PATCH 11/17] staging: r8188eu: make OnAuth static Martin Kaiser
2022-10-24 8:14 ` [PATCH 12/17] staging: r8188eu: change mlme handlers to void Martin Kaiser
2022-10-24 8:14 ` Martin Kaiser [this message]
2022-10-24 8:14 ` [PATCH 14/17] staging: r8188eu: remove unnecessary else branch Martin Kaiser
2022-10-24 8:14 ` [PATCH 15/17] staging: r8188eu: remove unnecessary return Martin Kaiser
2022-10-24 8:14 ` [PATCH 16/17] staging: r8188eu: remove an else branch Martin Kaiser
2022-10-24 8:14 ` [PATCH 17/17] staging: r8188eu: go2asoc is not needed Martin Kaiser
2022-10-24 17:43 ` [PATCH 00/17] staging: r8188eu: clean up mlme handlers 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=20221024081417.66441-14-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®