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 8/9] staging: r8188eu: summarize two flags checks
Date: Sat, 15 Oct 2022 17:24:39 +0200 [thread overview]
Message-ID: <20221015152440.232281-9-martin@kaiser.cx> (raw)
In-Reply-To: <20221015152440.232281-1-martin@kaiser.cx>
Summarize the two statements to check if either WIFI_FW_AUTH_STATE or
WIFI_FW_ASSOC_STATE is set.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 465f51bce0e3..09ffecc5b2b3 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -1500,8 +1500,7 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)
* However, the Win8.1 with BRCM Wi-Fi will send the deauth with reason code 6 to us after receieving our deauth.
* Added the following code to avoid this case.
*/
- if ((pmlmeinfo->state & WIFI_FW_AUTH_STATE) ||
- (pmlmeinfo->state & WIFI_FW_ASSOC_STATE)) {
+ if (pmlmeinfo->state & (WIFI_FW_AUTH_STATE | WIFI_FW_ASSOC_STATE)) {
if (reason == WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA) {
ignore_received_deauth = 1;
} else if (reason == WLAN_REASON_PREV_AUTH_NOT_VALID) {
--
2.30.2
next prev parent reply other threads:[~2022-10-15 15:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-15 15:24 [PATCH 0/9] staging: r8188eu: clean up the OnDeAuth function Martin Kaiser
2022-10-15 15:24 ` [PATCH 1/9] staging: r8188eu: replace one GetAddr3Ptr call Martin Kaiser
2022-10-15 15:24 ` [PATCH 2/9] staging: r8188eu: get reason code from mgmt struct Martin Kaiser
2022-10-15 15:24 ` [PATCH 3/9] staging: r8188eu: clarify the bBusyTraffic assignment Martin Kaiser
2022-10-15 15:24 ` [PATCH 4/9] staging: r8188eu: use sa instead of Addr2 Martin Kaiser
2022-10-15 15:24 ` [PATCH 5/9] staging: r8188eu: get bssid from mgmt struct Martin Kaiser
2022-10-15 15:24 ` [PATCH 6/9] staging: r8188eu: exit for deauth from unknown station Martin Kaiser
2022-10-15 15:24 ` [PATCH 7/9] staging: r8188eu: remove unnecessary return Martin Kaiser
2022-10-15 15:24 ` Martin Kaiser [this message]
2022-10-15 15:24 ` [PATCH 9/9] staging: r8188eu: ignore_received_deauth is a boolean Martin Kaiser
2022-10-15 15:56 ` [PATCH 0/9] staging: r8188eu: clean up the OnDeAuth function Pavel Skripkin
2022-10-15 20:31 ` 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=20221015152440.232281-9-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