From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH 7/9] staging: r8188eu: simplify if-else statement
Date: Mon, 28 Mar 2022 13:39:38 +0200 [thread overview]
Message-ID: <20220328113940.6396-8-straube.linux@gmail.com> (raw)
In-Reply-To: <20220328113940.6396-1-straube.linux@gmail.com>
Simplify a nested if-else statement to a single if statement in
rtw_joinbss_reset(). This improves readability and shortens the code.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 83841cf85a0d..1569f719af1b 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -1810,19 +1810,15 @@ void rtw_joinbss_reset(struct adapter *padapter)
phtpriv->ampdu_enable = false;/* reset to disabled */
- /* TH = 1 => means that invalidate usb rx aggregation */
- /* TH = 0 => means that validate usb rx aggregation, use init value. */
- if (phtpriv->ht_option) {
- if (padapter->registrypriv.wifi_spec == 1)
- threshold = 1;
- else
- threshold = USB_RXAGG_PAGE_COUNT;
+ /* invalidate usb rx aggregation */
+ threshold = 1;
- rtw_write8(padapter, REG_RXDMA_AGG_PG_TH, threshold);
- } else {
- threshold = 1;
- rtw_write8(padapter, REG_RXDMA_AGG_PG_TH, threshold);
+ if (phtpriv->ht_option && padapter->registrypriv.wifi_spec != 1) {
+ /* validate usb rx aggregation, use init value. */
+ threshold = USB_RXAGG_PAGE_COUNT;
}
+
+ rtw_write8(padapter, REG_RXDMA_AGG_PG_TH, threshold);
}
/* the function is >= passive_level */
--
2.35.1
next prev parent reply other threads:[~2022-03-28 11:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-28 11:39 [PATCH 0/9] staging: r8188eu: SetHwReg8188EU() cleanups Michael Straube
2022-03-28 11:39 ` [PATCH 1/9] staging: r8188eu: remove HW_VAR_RESP_SIFS from SetHwReg8188EU() Michael Straube
2022-03-28 11:39 ` [PATCH 2/9] staging: r8188eu: remove HW_VAR_MLME_DISCONNECT " Michael Straube
2022-03-28 11:39 ` [PATCH 3/9] staging: r8188eu: rename some macros to upper case Michael Straube
2022-03-28 11:39 ` [PATCH 4/9] staging: r8188eu: remove HW_VAR_ACM_CTRL from SetHwReg8188EU() Michael Straube
2022-03-29 16:02 ` Greg KH
2022-03-29 16:25 ` Michael Straube
2022-03-28 11:39 ` [PATCH 5/9] staging: r8188eu: remove HW_VAR_RXDMA_AGG_PG_TH " Michael Straube
2022-03-29 16:04 ` Greg KH
2022-03-28 11:39 ` [PATCH 6/9] staging: r8188eu: remove unnecessary if statement Michael Straube
2022-03-28 11:39 ` Michael Straube [this message]
2022-03-28 11:39 ` [PATCH 8/9] staging: r8188eu: remove HW_VAR_TX_RPT_MAX_MACID from SetHwReg8188EU() Michael Straube
2022-03-29 16:04 ` Greg KH
2022-03-28 11:39 ` [PATCH 9/9] staging: r8188eu: remove HW_VAR_BCN_VALID " Michael Straube
2022-03-29 16:05 ` Greg KH
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=20220328113940.6396-8-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/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;
as well as URLs for NNTP newsgroup(s).